[openldap] new upstream release (2.4.34)
jvcelak
jvcelak at fedoraproject.org
Wed Mar 6 22:26:54 UTC 2013
commit 705b2a50321b70b6dd97a50885f6c938f878c217
Author: Jan Vcelak <jvcelak at fedoraproject.org>
Date: Wed Mar 6 23:09:06 2013 +0100
new upstream release (2.4.34)
Resolves: #917603 #872784
.gitignore | 1 +
openldap-ai-addrconfig.patch | 11 +-
openldap-autoreconf.patch |10668 +++++++++++----------
openldap-evolution-ntlm.patch | 23 +-
openldap-fedora-systemd.patch | 9 +-
openldap-ldaprc-currentdir.patch | 8 +-
openldap-manpages.patch | 55 +-
openldap-nss-certs-from-certdb-fallback-pem.patch | 11 +-
openldap-reentrant-gethostby.patch | 8 +-
openldap-rwm-slapd-segfault-modrdn.patch | 33 -
openldap-syncrepl-unset-tls-options.patch | 15 +-
openldap-tls-no-reuse-of-tls_session.patch | 37 +-
openldap-userconfig-setgid.patch | 8 +-
openldap.spec | 10 +-
sources | 2 +-
15 files changed, 5746 insertions(+), 5153 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c49f049..dc36b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/openldap-2.4.31.tgz
/openldap-2.4.32.tgz
/openldap-2.4.33.tgz
+/openldap-2.4.34.tgz
diff --git a/openldap-ai-addrconfig.patch b/openldap-ai-addrconfig.patch
index 9b3c959..0858fac 100644
--- a/openldap-ai-addrconfig.patch
+++ b/openldap-ai-addrconfig.patch
@@ -4,15 +4,11 @@ Author: Jan Vcelak <jvcelak at redhat.com>
Upstream ITS: #7326
Resolves: #835013
----
- libraries/libldap/os-ip.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
-index 2864256..c3e0876 100644
+index b31e05d..fa361ab 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
-@@ -584,8 +584,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
+@@ -594,8 +594,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
memset( &hints, '\0', sizeof(hints) );
@@ -22,6 +18,3 @@ index 2864256..c3e0876 100644
hints.ai_flags = AI_ADDRCONFIG;
#endif
hints.ai_family = ldap_int_inet4or6;
---
-1.7.10.4
-
diff --git a/openldap-autoreconf.patch b/openldap-autoreconf.patch
index 05f2ebe..80100ef 100644
--- a/openldap-autoreconf.patch
+++ b/openldap-autoreconf.patch
@@ -3,32 +3,24 @@ Changes performed by autoreconf (necessary because we patch the build process)
AUTOMAKE=/bin/true autoreconf --install --force
rm -rf autom4te.cache/
-Author: Jan Vcelak <jvcelak at redhat.com>
-
----
- aclocal.m4 | 12640 +++++++++++++++++++++++---------------
- build/ltmain.sh | 14547 +++++++++++++++++++++++++------------------
- configure | 16379 +++++++++++++++++++++++++++++--------------------
- include/portable.hin | 41 +-
- 4 files changed, 26026 insertions(+), 17581 deletions(-)
- mode change 100755 => 100644 build/ltmain.sh
+Author: Jan Vcelak <jvcelak at fedoraproject.org>
diff --git a/aclocal.m4 b/aclocal.m4
-index d5ecbec..77f71fd 100644
+index d5ecbec..0b3622e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -1,7 +1,8 @@
+@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
++
++# Copyright (C) 1996-2012 Free Software Foundation, Inc.
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-+# 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.
-@@ -11,581 +12,208 @@
+@@ -11,737 +11,943 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -54,11 +46,11 @@ index d5ecbec..77f71fd 100644
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-+[m4_warning([this file was generated for autoconf 2.68.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
++[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
++To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -471,9 +463,11 @@ index d5ecbec..77f71fd 100644
-# 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.
--
++_LT_CHECK_OBJDIR
+
-#serial 3
--
++m4_require([_LT_TAG_COMPILER])dnl
+
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -490,7 +484,15 @@ index d5ecbec..77f71fd 100644
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-- fi
++case $host_os in
++aix3*)
++ # AIX sometimes has problems with the GCC collect2 program. For some
++ # reason, if we set the COLLECT_NAMES environment variable, the problems
++ # vanish in a puff of smoke.
++ if test "X${COLLECT_NAMES+set}" != Xset; then
++ COLLECT_NAMES=
++ export COLLECT_NAMES
+ fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
@@ -516,8 +518,13 @@ index d5ecbec..77f71fd 100644
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--
--
++ ;;
++esac
+
++# Global variables:
++ofile=libtool
++can_build_shared=yes
+
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -532,19 +539,31 @@ index d5ecbec..77f71fd 100644
-])
-
-# Do all the work for Automake. -*- Autoconf -*-
--
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
+
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
-# serial 12
--
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
--
++# Set sane defaults for various variables
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$LD" && LD=ld
++test -z "$ac_objext" && ac_objext=o
+
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
@@ -568,17 +587,26 @@ index d5ecbec..77f71fd 100644
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
--
++_LT_CC_BASENAME([$compiler])
+
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
-- fi
++# Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++case $deplibs_check_method in
++file_magic*)
++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++ _LT_PATH_MAGIC
+ fi
-fi
-AC_SUBST([CYGPATH_W])
--
++ ;;
++esac
+
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
@@ -588,11 +616,17 @@ index d5ecbec..77f71fd 100644
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
++# Use C for the default configuration in the libtool script
++LT_SUPPORTED_TAG([CC])
++_LT_LANG_C_CONFIG
++_LT_LANG_DEFAULT_CONFIG
++_LT_CONFIG_COMMANDS
++])# _LT_SETUP
+
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
+
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -623,12 +657,24 @@ index d5ecbec..77f71fd 100644
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
--
--
++# _LT_PREPARE_SED_QUOTE_VARS
++# --------------------------
++# Define a few sed substitution that help us do robust quoting.
++m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
++[# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
--
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
@@ -644,13 +690,18 @@ index d5ecbec..77f71fd 100644
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
--
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++])
+
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
@@ -658,15 +709,26 @@ index d5ecbec..77f71fd 100644
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
--
++# _LT_PROG_LTMAIN
++# ---------------
++# Note that this code is called both from `configure', and `config.status'
++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# so we pass a copy along to make sure it has a sensible value anyway.
++m4_defun([_LT_PROG_LTMAIN],
++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
++ltmain="$ac_aux_dir/ltmain.sh"
++])# _LT_PROG_LTMAIN
+
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
+
-# serial 2
--
+
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
@@ -679,12 +741,26 @@ index d5ecbec..77f71fd 100644
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
--
++# So that we can recreate a full libtool script including additional
++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
++# in macros and then make a single call at the end using the `libtool'
++# label.
+
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--
+
-# serial 47 AC_PROG_LIBTOOL
--
--
++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
++# ----------------------------------------
++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL_INIT],
++[m4_ifval([$1],
++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
++ [$1
++])])])
+
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
@@ -693,9 +769,27 @@ index d5ecbec..77f71fd 100644
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-+_LT_CHECK_OBJDIR
--
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++ [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
+
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
@@ -738,268 +832,9 @@ index d5ecbec..77f71fd 100644
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
--
+
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
--
--
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
--AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
--dnl
--
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
--
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
-+m4_require([_LT_TAG_COMPILER])dnl
-
- case $host_os in
- aix3*)
-@@ -599,149 +227,728 @@ aix3*)
- ;;
- esac
-
--# Sed substitution that helps us do robust quoting. It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
--
--# Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
--# Constants:
--rm="rm -f"
--
- # Global variables:
--default_ofile=libtool
-+ofile=libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
-
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-
- old_CC="$CC"
- old_CFLAGS="$CFLAGS"
-
- # Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
- test -z "$CC" && CC=cc
- test -z "$LTCC" && LTCC=$CC
--test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
- test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$SED" && SED=sed
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
- test -z "$ac_objext" && ac_objext=o
-
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
--
--if test -n "$RANLIB"; then
-- case $host_os in
-- openbsd*)
-- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-- ;;
-- *)
-- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-- ;;
-- esac
-- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
--
- _LT_CC_BASENAME([$compiler])
-
- # Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
- case $deplibs_check_method in
- file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-- AC_PATH_MAGIC
-+ _LT_PATH_MAGIC
- fi
- ;;
- esac
-
--AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-
--AC_ARG_ENABLE([libtool-lock],
-- [AC_HELP_STRING([--disable-libtool-lock],
-- [avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
--AC_ARG_WITH([pic],
-- [AC_HELP_STRING([--with-pic],
-- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-- [pic_mode="$withval"],
-- [pic_mode=default])
--test -z "$pic_mode" && pic_mode=default
-+# _LT_PREPARE_SED_QUOTE_VARS
-+# --------------------------
-+# Define a few sed substitution that help us do robust quoting.
-+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-+[# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
--# Use C for the default configuration in the libtool script
--tagname=
--AC_LIBTOOL_LANG_C_CONFIG
--_LT_AC_TAGCONFIG
--])# AC_LIBTOOL_SETUP
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
--# _LT_AC_SYS_COMPILER
--# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+])
-
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_AC_SYS_COMPILER
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
-
-
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
--AC_DEFUN([_LT_CC_BASENAME],
--[for cc_temp in $1""; do
-- case $cc_temp in
-- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-- \-*) ;;
-- *) break;;
-- esac
--done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--])
-
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
@@ -1030,19 +865,47 @@ index d5ecbec..77f71fd 100644
+ lt_dict_add_subkey([lt_decl_dict], [$2],
+ [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
-+
-+
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
+
+
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
+
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-dnl
+
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
@@ -1053,20 +916,44 @@ index d5ecbec..77f71fd 100644
+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
-+
-+
+
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
+
+-case $host_os in
+-aix3*)
+- # AIX sometimes has problems with the GCC collect2 program. For some
+- # reason, if we set the COLLECT_NAMES environment variable, the problems
+- # vanish in a puff of smoke.
+- if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+- fi
+- ;;
+-esac
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
-+
-+
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
-+
-+
+
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
@@ -1076,8 +963,13 @@ index d5ecbec..77f71fd 100644
+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
+
+-# Constants:
+-rm="rm -f"
+
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
@@ -1090,8 +982,17 @@ index d5ecbec..77f71fd 100644
+[lt_join($@, lt_decl_varnames_tagged([$1],
+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
-+
-+
+
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
@@ -1099,8 +1000,26 @@ index d5ecbec..77f71fd 100644
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-+
-+
+
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
+
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
@@ -1112,8 +1031,23 @@ index d5ecbec..77f71fd 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)])])])
-+
-+
+
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+
+-if test -n "$RANLIB"; then
+- case $host_os in
+- openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+- ;;
+- *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+- ;;
+- esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
@@ -1121,8 +1055,17 @@ index d5ecbec..77f71fd 100644
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
-+
-+
+
+-_LT_CC_BASENAME([$compiler])
+
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- AC_PATH_MAGIC
+- fi
+- ;;
+-esac
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
@@ -1142,8 +1085,15 @@ index d5ecbec..77f71fd 100644
+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
-+
-+
+
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
+
+-AC_ARG_ENABLE([libtool-lock],
+- [AC_HELP_STRING([--disable-libtool-lock],
+- [avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
@@ -1154,20 +1104,40 @@ index d5ecbec..77f71fd 100644
+[m4_foreach([_lt_var],
+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
+
+-AC_ARG_WITH([pic],
+- [AC_HELP_STRING([--with-pic],
+- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
+- [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
-+
+
+
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-+
-+
+
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
@@ -1194,11 +1164,25 @@ index d5ecbec..77f71fd 100644
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
-+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
+
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+- case $cc_temp in
+- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-])
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
@@ -1593,11 +1577,11 @@ index d5ecbec..77f71fd 100644
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
+
+
+ # _LT_COMPILER_BOILERPLATE
+ # ------------------------
+ # Check for compiler boilerplate output or warnings with
# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
@@ -1614,7 +1598,7 @@ index d5ecbec..77f71fd 100644
])# _LT_COMPILER_BOILERPLATE
-@@ -749,207 +956,323 @@ $rm conftest*
+@@ -749,207 +955,323 @@ $rm conftest*
# ----------------------
# Check for linker boilerplate output or warnings with
# the simple link test code.
@@ -2113,7 +2097,7 @@ index d5ecbec..77f71fd 100644
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -960,86 +1283,93 @@ ia64-*-hpux*)
+@@ -960,86 +1282,93 @@ ia64-*-hpux*)
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
@@ -2272,7 +2256,7 @@ index d5ecbec..77f71fd 100644
esac
fi
rm -rf conftest*
-@@ -1051,37 +1381,145 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+@@ -1051,37 +1380,145 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
@@ -2289,6 +2273,13 @@ index d5ecbec..77f71fd 100644
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+- ])
+-esac
+-
+-need_locks="$enable_libtool_lock"
+-
+-])# _LT_AC_LOCK
+*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
@@ -2320,11 +2311,10 @@ index d5ecbec..77f71fd 100644
+ esac
+ fi
+ rm -rf conftest*
- ;;
-- ])
- esac
-
- need_locks="$enable_libtool_lock"
++ ;;
++esac
++
++need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
@@ -2395,8 +2385,7 @@ index d5ecbec..77f71fd 100644
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
-
--])# _LT_AC_LOCK
++
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
@@ -2431,7 +2420,7 @@ index d5ecbec..77f71fd 100644
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -1092,49 +1530,56 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1092,49 +1529,56 @@ 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:'`
@@ -2506,7 +2495,7 @@ index d5ecbec..77f71fd 100644
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
-@@ -1142,22 +1587,28 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+@@ -1142,22 +1586,28 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
$2=yes
fi
fi
@@ -2543,7 +2532,7 @@ index d5ecbec..77f71fd 100644
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
-@@ -1179,7 +1630,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1179,7 +1629,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=-1;
;;
@@ -2552,7 +2541,7 @@ index d5ecbec..77f71fd 100644
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1190,6 +1641,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1190,6 +1640,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
@@ -2564,7 +2553,7 @@ index d5ecbec..77f71fd 100644
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1209,6 +1665,17 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1209,6 +1664,17 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
;;
@@ -2582,7 +2571,7 @@ index d5ecbec..77f71fd 100644
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
-@@ -1222,25 +1689,47 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1222,25 +1688,47 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
esac
fi
;;
@@ -2648,7 +2637,7 @@ index d5ecbec..77f71fd 100644
;;
esac
])
-@@ -1249,28 +1738,36 @@ if test -n $lt_cv_sys_max_cmd_len ; then
+@@ -1249,28 +1737,36 @@ if test -n $lt_cv_sys_max_cmd_len ; then
else
AC_MSG_RESULT(none)
fi
@@ -2698,7 +2687,7 @@ index d5ecbec..77f71fd 100644
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -1311,11 +1808,13 @@ else
+@@ -1311,11 +1807,13 @@ else
# endif
#endif
@@ -2715,7 +2704,7 @@ index d5ecbec..77f71fd 100644
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1324,20 +1823,26 @@ int main ()
+@@ -1324,20 +1822,26 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -2746,7 +2735,7 @@ index d5ecbec..77f71fd 100644
esac
else :
# compilation failed
-@@ -1345,13 +1850,13 @@ EOF
+@@ -1345,13 +1849,13 @@ EOF
fi
fi
rm -fr conftest*
@@ -2765,7 +2754,7 @@ index d5ecbec..77f71fd 100644
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
-@@ -1367,15 +1872,15 @@ else
+@@ -1367,15 +1871,15 @@ else
lt_cv_dlopen_self=yes
;;
@@ -2784,7 +2773,7 @@ index d5ecbec..77f71fd 100644
darwin*)
# if libdl is installed we need to link against it
-@@ -1385,13 +1890,13 @@ else
+@@ -1385,13 +1889,13 @@ else
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
@@ -2800,7 +2789,7 @@ index d5ecbec..77f71fd 100644
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -1399,7 +1904,7 @@ else
+@@ -1399,7 +1903,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -2809,7 +2798,7 @@ index d5ecbec..77f71fd 100644
])
])
])
-@@ -1420,23 +1925,23 @@ else
+@@ -1420,23 +1924,23 @@ else
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -2838,7 +2827,7 @@ index d5ecbec..77f71fd 100644
lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
])
-@@ -1458,22 +1963,36 @@ else
+@@ -1458,22 +1962,36 @@ else
*) enable_dlopen_self_static=unknown ;;
esac
fi
@@ -2885,7 +2874,7 @@ index d5ecbec..77f71fd 100644
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1484,46 +2003,50 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+@@ -1484,46 +2002,50 @@ 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:'`
@@ -2954,7 +2943,7 @@ index d5ecbec..77f71fd 100644
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
-@@ -1536,12 +2059,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
+@@ -1536,12 +2058,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
else
need_locks=no
fi
@@ -2972,7 +2961,7 @@ index d5ecbec..77f71fd 100644
[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
[rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
-@@ -1553,40 +2077,46 @@ else
+@@ -1553,40 +2076,46 @@ else
fi
rmdir .libs 2>/dev/null])
objdir=$lt_cv_objdir
@@ -3036,7 +3025,7 @@ index d5ecbec..77f71fd 100644
# Fast installation is not supported
enable_fast_install=no
elif test "$shlibpath_overrides_runpath" = yes ||
-@@ -1594,43 +2124,121 @@ elif test "$shlibpath_overrides_runpath" = yes ||
+@@ -1594,43 +2123,121 @@ elif test "$shlibpath_overrides_runpath" = yes ||
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -3178,7 +3167,7 @@ index d5ecbec..77f71fd 100644
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1644,20 +2252,6 @@ shlibpath_overrides_runpath=unknown
+@@ -1644,20 +2251,6 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3199,7 +3188,7 @@ index d5ecbec..77f71fd 100644
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1667,7 +2261,7 @@ need_version=unknown
+@@ -1667,7 +2260,7 @@ need_version=unknown
case $host_os in
aix3*)
@@ -3208,7 +3197,7 @@ index d5ecbec..77f71fd 100644
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
-@@ -1675,8 +2269,8 @@ aix3*)
+@@ -1675,8 +2268,8 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3219,7 +3208,7 @@ index d5ecbec..77f71fd 100644
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
-@@ -1694,7 +2288,7 @@ aix4* | aix5*)
+@@ -1694,7 +2287,7 @@ aix4* | aix5*)
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
@@ -3228,7 +3217,7 @@ index d5ecbec..77f71fd 100644
:
else
can_build_shared=no
-@@ -1720,9 +2314,18 @@ aix4* | aix5*)
+@@ -1720,9 +2313,18 @@ aix4* | aix5*)
;;
amigaos*)
@@ -3250,7 +3239,7 @@ index d5ecbec..77f71fd 100644
;;
beos*)
-@@ -1732,7 +2335,7 @@ beos*)
+@@ -1732,7 +2334,7 @@ beos*)
;;
bsdi[[45]]*)
@@ -3259,7 +3248,7 @@ index d5ecbec..77f71fd 100644
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'
-@@ -1745,61 +2348,112 @@ bsdi[[45]]*)
+@@ -1745,61 +2347,112 @@ bsdi[[45]]*)
# libtool to hard-code these into programs
;;
@@ -3393,7 +3382,7 @@ index d5ecbec..77f71fd 100644
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -1809,22 +2463,18 @@ darwin* | rhapsody*)
+@@ -1809,22 +2462,18 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
@@ -3420,7 +3409,7 @@ index d5ecbec..77f71fd 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -1832,22 +2482,6 @@ dgux*)
+@@ -1832,22 +2481,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -3443,7 +3432,7 @@ index d5ecbec..77f71fd 100644
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -1855,7 +2489,7 @@ freebsd* | dragonfly*)
+@@ -1855,7 +2488,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -3452,7 +3441,7 @@ index d5ecbec..77f71fd 100644
*) objformat=elf ;;
esac
fi
-@@ -1873,27 +2507,46 @@ freebsd* | dragonfly*)
+@@ -1873,27 +2506,46 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3502,7 +3491,7 @@ index d5ecbec..77f71fd 100644
hardcode_into_libs=yes
;;
-@@ -1919,18 +2572,18 @@ hpux9* | hpux10* | hpux11*)
+@@ -1919,18 +2571,18 @@ hpux9* | hpux10* | hpux11*)
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -3533,7 +3522,7 @@ index d5ecbec..77f71fd 100644
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
-@@ -1939,8 +2592,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1939,8 +2591,22 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -3557,7 +3546,7 @@ index d5ecbec..77f71fd 100644
;;
irix5* | irix6* | nonstopux*)
-@@ -1948,7 +2615,7 @@ irix5* | irix6* | nonstopux*)
+@@ -1948,7 +2614,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
@@ -3566,7 +3555,7 @@ index d5ecbec..77f71fd 100644
else
version_type=irix
fi ;;
-@@ -1985,9 +2652,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+@@ -1985,9 +2651,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
@@ -3579,7 +3568,7 @@ index d5ecbec..77f71fd 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1995,15 +2662,35 @@ linux*)
+@@ -1995,15 +2661,35 @@ linux*)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -3617,7 +3606,7 @@ index d5ecbec..77f71fd 100644
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2015,23 +2702,11 @@ linux*)
+@@ -2015,23 +2701,11 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3642,7 +3631,7 @@ index d5ecbec..77f71fd 100644
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -2046,34 +2721,37 @@ netbsd*)
+@@ -2046,34 +2720,37 @@ netbsd*)
;;
newsos6)
@@ -3687,7 +3676,7 @@ index d5ecbec..77f71fd 100644
case $host_os in
openbsd2.[[89]] | openbsd2.[[89]].*)
shlibpath_overrides_runpath=no
-@@ -2107,15 +2785,12 @@ osf3* | osf4* | osf5*)
+@@ -2107,15 +2784,12 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3706,7 +3695,7 @@ index d5ecbec..77f71fd 100644
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2139,8 +2814,8 @@ sunos4*)
+@@ -2139,8 +2813,8 @@ sunos4*)
need_version=yes
;;
@@ -3717,7 +3706,7 @@ index d5ecbec..77f71fd 100644
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
-@@ -2148,7 +2823,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2148,7 +2822,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
sni)
shlibpath_overrides_runpath=no
need_lib_prefix=no
@@ -3725,7 +3714,7 @@ index d5ecbec..77f71fd 100644
runpath_var=LD_RUN_PATH
;;
siemens)
-@@ -2165,15 +2839,48 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2165,15 +2838,48 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
sysv4*MP*)
if test -d /usr/nec ;then
@@ -3776,7 +3765,7 @@ index d5ecbec..77f71fd 100644
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
-@@ -2185,273 +2892,61 @@ uts4*)
+@@ -2185,273 +2891,61 @@ uts4*)
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -3863,7 +3852,7 @@ index d5ecbec..77f71fd 100644
- AC_MSG_ERROR([Unsupported tag name: $tagname])
- ;;
- esac
--
+
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
@@ -3871,7 +3860,7 @@ index d5ecbec..77f71fd 100644
- fi
- done
- IFS="$lt_save_ifs"
-
+-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
@@ -4100,7 +4089,7 @@ index d5ecbec..77f71fd 100644
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
-@@ -2464,7 +2959,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+@@ -2464,7 +2958,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
@@ -4109,7 +4098,7 @@ index d5ecbec..77f71fd 100644
for ac_dir in $ac_dummy; do
IFS="$lt_save_ifs"
test -z "$ac_dir" && ac_dir=.
-@@ -2479,7 +2974,7 @@ dnl not every word. This closes a longstanding sh security hole.
+@@ -2479,7 +2973,7 @@ dnl not every word. This closes a longstanding sh security hole.
$EGREP "$file_magic_regex" > /dev/null; then
:
else
@@ -4118,7 +4107,7 @@ index d5ecbec..77f71fd 100644
*** Warning: the command libtool uses to detect shared libraries,
*** $file_magic_cmd, produces output that libtool cannot recognize.
-@@ -2490,7 +2985,7 @@ dnl not every word. This closes a longstanding sh security hole.
+@@ -2490,7 +2984,7 @@ dnl not every word. This closes a longstanding sh security hole.
*** may want to report the problem to your system manager and/or to
*** bug-libtool at gnu.org
@@ -4127,7 +4116,7 @@ index d5ecbec..77f71fd 100644
fi ;;
esac
fi
-@@ -2507,37 +3002,48 @@ if test -n "$MAGIC_CMD"; then
+@@ -2507,37 +3001,48 @@ if test -n "$MAGIC_CMD"; then
else
AC_MSG_RESULT(no)
fi
@@ -4193,7 +4182,7 @@ index d5ecbec..77f71fd 100644
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
-@@ -2554,9 +3060,9 @@ if test "$GCC" = yes; then
+@@ -2554,9 +3059,9 @@ if test "$GCC" = yes; then
[[\\/]]* | ?:[[\\/]]*)
re_direlt='/[[^/]][[^/]]*/\.\./'
# Canonicalize the pathname of ld
@@ -4206,7 +4195,7 @@ index d5ecbec..77f71fd 100644
done
test -z "$LD" && LD="$ac_prog"
;;
-@@ -2606,15 +3112,24 @@ else
+@@ -2606,15 +3111,24 @@ else
AC_MSG_RESULT(no)
fi
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
@@ -4238,7 +4227,7 @@ index d5ecbec..77f71fd 100644
[# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2625,14 +3140,14 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -2625,14 +3139,14 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac])
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -4257,7 +4246,7 @@ index d5ecbec..77f71fd 100644
[AC_CACHE_CHECK([for $LD option to reload object files],
lt_cv_ld_reload_flag,
[lt_cv_ld_reload_flag='-r'])
-@@ -2643,23 +3158,32 @@ case $reload_flag in
+@@ -2643,23 +3157,32 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -4296,7 +4285,7 @@ index d5ecbec..77f71fd 100644
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2676,7 +3200,7 @@ lt_cv_deplibs_check_method='unknown'
+@@ -2676,7 +3199,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -4305,7 +4294,7 @@ index d5ecbec..77f71fd 100644
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2698,8 +3222,22 @@ cygwin*)
+@@ -2698,8 +3221,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -4330,7 +4319,7 @@ index d5ecbec..77f71fd 100644
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
-@@ -2707,8 +3245,8 @@ darwin* | rhapsody*)
+@@ -2707,8 +3244,8 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4341,7 +4330,7 @@ index d5ecbec..77f71fd 100644
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
-@@ -2727,6 +3265,10 @@ gnu*)
+@@ -2727,6 +3264,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4352,7 +4341,7 @@ index d5ecbec..77f71fd 100644
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -2735,16 +3277,21 @@ hpux10.20* | hpux11*)
+@@ -2735,16 +3276,21 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -4376,7 +4365,7 @@ index d5ecbec..77f71fd 100644
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2755,13 +3302,13 @@ irix5* | irix6* | nonstopux*)
+@@ -2755,13 +3301,13 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4393,7 +4382,7 @@ index d5ecbec..77f71fd 100644
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-@@ -2774,12 +3321,12 @@ newos6*)
+@@ -2774,12 +3320,12 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
@@ -4409,7 +4398,7 @@ index d5ecbec..77f71fd 100644
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-@@ -2790,7 +3337,7 @@ osf3* | osf4* | osf5*)
+@@ -2790,7 +3336,7 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4418,7 +4407,7 @@ index d5ecbec..77f71fd 100644
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2798,7 +3345,11 @@ solaris*)
+@@ -2798,7 +3344,11 @@ solaris*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4431,7 +4420,7 @@ index d5ecbec..77f71fd 100644
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2819,73 +3370,216 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2819,3849 +3369,6050 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4466,7 +4455,7 @@ index d5ecbec..77f71fd 100644
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-+
+
+_LT_DECL([], [deplibs_check_method], [1],
+ [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
@@ -4477,8 +4466,8 @@ index d5ecbec..77f71fd 100644
+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
-
-# AC_PROG_NM
++
+# LT_PATH_NM
# ----------
-# find the pathname to a BSD-compatible name lister
@@ -4558,6 +4547,7 @@ index d5ecbec..77f71fd 100644
fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
+-
+if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+else
@@ -4620,7 +4610,20 @@ index d5ecbec..77f71fd 100644
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
+
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[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
@@ -4633,65 +4636,19 @@ index d5ecbec..77f71fd 100644
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
-+ ;;
-+*)
+ ;;
+ *)
+- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+ ;;
-+esac
-+])
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-+ [Command to associate shared and link libraries])
-+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
--# AC_CHECK_LIBM
--# -------------
-+
-+# _LT_PATH_MANIFEST_TOOL
-+# ----------------------
-+# locate the manifest tool
-+m4_defun([_LT_PATH_MANIFEST_TOOL],
-+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-+ [lt_cv_path_mainfest_tool=no
-+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+ lt_cv_path_mainfest_tool=yes
-+ fi
-+ rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+ MANIFEST_TOOL=:
-+fi
-+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-+])# _LT_PATH_MANIFEST_TOOL
-+
-+
-+# LT_LIB_M
-+# --------
- # check for math library
--AC_DEFUN([AC_CHECK_LIBM],
-+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*)
-@@ -2896,3772 +3590,5774 @@ case $host in
- AC_CHECK_LIB(m, cos, LIBM="-lm")
;;
esac
-])# AC_CHECK_LIBM
-
--
++])
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
@@ -4715,10 +4672,11 @@ index d5ecbec..77f71fd 100644
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
++_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
++ [Command to associate shared and link libraries])
++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
--
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
@@ -4749,29 +4707,33 @@ index d5ecbec..77f71fd 100644
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
-- fi
++# _LT_PATH_MANIFEST_TOOL
++# ----------------------
++# locate the manifest tool
++m4_defun([_LT_PATH_MANIFEST_TOOL],
++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
++ [lt_cv_path_mainfest_tool=no
++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++ lt_cv_path_mainfest_tool=yes
+ fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
+-
+-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
-
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
+-
+-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
@@ -4779,14 +4741,7 @@ index d5ecbec..77f71fd 100644
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-+if test "$GCC" = yes; then
-+ case $cc_basename in
-+ nvcc*)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-+ esac
-
+-
-# _LT_AC_PROG_CXXCPP
-# ---------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
@@ -4796,95 +4751,37 @@ index d5ecbec..77f71fd 100644
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+ lt_cv_prog_compiler_rtti_exceptions,
-+ [-fno-rtti -fno-exceptions], [],
-+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++ rm -f conftest*])
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++ MANIFEST_TOOL=:
fi
-])# _LT_AC_PROG_CXXCPP
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+ [Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
-
+-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-
+-
+-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-
+-
+-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
++])# _LT_PATH_MANIFEST_TOOL
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[[BCDT]]'
-+ ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+ symcode='[[ABCDGISTW]]'
-+ ;;
-+hpux*)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDEGRST]]'
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[[BCDEGRST]]'
-+ ;;
-+osf*)
-+ symcode='[[BCDEGQRST]]'
-+ ;;
-+solaris*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sco3.2v5*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[[ABDT]]'
-+ ;;
-+sysv4)
-+ symcode='[[DFNSTU]]'
-+ ;;
-+esac
-# _LT_AC_LANG_GCJ
-# ---------------
@@ -4906,17 +4803,8 @@ index d5ecbec..77f71fd 100644
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[[ABCDGIRSTW]]' ;;
-+esac
-
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
+-
+-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
@@ -4926,76 +4814,54 @@ index d5ecbec..77f71fd 100644
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-
+-
-# Source file extension for C test sources.
-ac_ext=c
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
-
+-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
++# LT_LIB_M
++# --------
++# check for math library
++AC_DEFUN([LT_LIB_M],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
++ # These system don't have libm, or don't need it
++ ;;
++*-ncr-sysv4.3*)
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++ ;;
++*)
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
++ ;;
++esac
++AC_SUBST([LIBM])
++])# LT_LIB_M
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
++# Old name:
++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_CHECK_LIBM], [])
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-+ # Write the raw and C identifiers.
-+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ # Fake it for dumpbin and say T for any non-static function
-+ # and D for any global variable.
-+ # Also find C++ and __fastcall symbols from MSVC++,
-+ # which start with @ or ?.
-+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+" {last_section=section; section=\$ 3};"\
-+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+" \$ 0!~/External *\|/{next};"\
-+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+" {if(hide[section]) next};"\
-+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+" ' prfx=^$ac_symprfx]"
-+ else
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+ fi
-+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-_LT_AC_SYS_COMPILER
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
++# _LT_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------
++m4_defun([_LT_COMPILER_NO_RTTI],
++[m4_require([_LT_TAG_COMPILER])dnl
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-#
-# Check for any special shared library compilation flags.
@@ -5006,7 +4872,13 @@ index d5ecbec..77f71fd 100644
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
-- esac
++if test "$GCC" = yes; then
++ case $cc_basename in
++ nvcc*)
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
++ *)
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -5016,32 +4888,15 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
- fi
-fi
-+ if AC_TRY_EVAL(ac_compile); then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+ # Make sure that we snagged all the symbols we need.
-+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+ relocations are performed -- see ld's documentation on pseudo-relocs. */
-+# define LT@&t at _DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data. */
-+# define LT@&t at _DLSYM_CONST
-+#else
-+# define LT@&t at _DLSYM_CONST const
-+#endif
++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++ lt_cv_prog_compiler_rtti_exceptions,
++ [-fno-rtti -fno-exceptions], [],
++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
++ [Compiler flag to turn off builtin functions])
++])# _LT_COMPILER_NO_RTTI
-#
-# Check to make sure the static flag actually works.
@@ -5051,13 +4906,18 @@ index d5ecbec..77f71fd 100644
- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+_LT_EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++# _LT_CMD_GLOBAL_SYMBOLS
++# ----------------------
++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++AC_REQUIRE([LT_PATH_LD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_TAG_COMPILER])dnl
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
@@ -5068,141 +4928,91 @@ index d5ecbec..77f71fd 100644
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-+ cat <<_LT_EOF >> conftest.$ac_ext
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-+/* The mapping between symbol names and symbols. */
-+LT@&t at _DLSYM_CONST struct {
-+ const char *name;
-+ void *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+ { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+ cat <<\_LT_EOF >> conftest.$ac_ext
-+ {0, (void *) 0}
-+};
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
--case $host_os in
++# Define system-specific variables.
+ case $host_os in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_globsym_save_LIBS=$LIBS
-+ lt_globsym_save_CFLAGS=$CFLAGS
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS=$lt_globsym_save_LIBS
-+ CFLAGS=$lt_globsym_save_CFLAGS
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+ cat conftest.$ac_ext >&5
- fi
-- ;;
-+ rm -rf conftest* conftst*
-
+- fi
++aix*)
++ symcode='[[BCDT]]'
+ ;;
+-
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
++cygwin* | mingw* | pw32* | cegcc*)
++ symcode='[[ABCDGISTW]]'
++ ;;
++hpux*)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDEGRST]]'
fi
- ;;
--esac
++ ;;
++irix* | nonstopux*)
++ symcode='[[BCDEGRST]]'
++ ;;
++osf*)
++ symcode='[[BCDEGQRST]]'
++ ;;
++solaris*)
++ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
++ ;;
++sysv4)
++ symcode='[[DFNSTU]]'
++ ;;
+ esac
-AC_MSG_RESULT([$enable_shared])
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ AC_MSG_RESULT(failed)
-+else
-+ AC_MSG_RESULT(ok)
-+fi
-
+-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-+ nm_file_list_spec='@'
-+fi
-
+-
-AC_LIBTOOL_CONFIG($1)
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+ [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+ [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+ [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+ [Transform the output of nm in a C name address pair when lib prefix is needed])
-+_LT_DECL([], [nm_file_list_spec], [1],
-+ [Specify filename containing input files for $NM])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
-+
-+
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
+-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-+m4_if([$1], [CXX], [
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
--
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++ symcode='[[ABCDGIRSTW]]' ;;
++esac
+
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
@@ -5232,34 +5042,89 @@ index d5ecbec..77f71fd 100644
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
--
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
-# Source file extension for C++ test sources.
-ac_ext=cpp
--
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++ ;;
++esac
+
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
--
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
+
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
--
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
--
++ # Write the raw and C identifiers.
++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
++ # Also find C++ and __fastcall symbols from MSVC++,
++ # which start with @ or ?.
++ lt_cv_sys_global_symbol_pipe="$AWK ['"\
++" {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++" \$ 0!~/External *\|/{next};"\
++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++" {if(hide[section]) next};"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++" ' prfx=^$ac_symprfx]"
++ else
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++ fi
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
--
++ # Check to see that the pipe works correctly.
++ pipe_works=no
+
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
--
++ rm -f conftest*
++ cat > conftest.$ac_ext <<_LT_EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
+
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
@@ -5282,7 +5147,17 @@ index d5ecbec..77f71fd 100644
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
--
++ if AC_TRY_EVAL(ac_compile); then
++ # Now try to grab the symbols.
++ nlist=conftest.nm
++ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
++ # Try sorting and uniquifying the output.
++ if sort "$nlist" | uniq > "$nlist"T; then
++ mv -f "$nlist"T "$nlist"
++ else
++ rm -f "$nlist"T
++ fi
+
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
@@ -5290,34 +5165,97 @@ index d5ecbec..77f71fd 100644
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
--
++ # Make sure that we snagged all the symbols we need.
++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
++ cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
++# define LT@&t at _DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data. */
++# define LT@&t at _DLSYM_CONST
++#else
++# define LT@&t at _DLSYM_CONST const
++#endif
+
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
--
++#ifdef __cplusplus
++extern "C" {
++#endif
+
- AC_PROG_LD
--
++_LT_EOF
++ # Now generate the symbol file.
++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
++ cat <<_LT_EOF >> conftest.$ac_ext
+
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
++/* The mapping between symbol names and symbols. */
++LT@&t at _DLSYM_CONST struct {
++ const char *name;
++ void *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[[]] =
++{
++ { "@PROGRAM@", (void *) 0 },
++_LT_EOF
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ cat <<\_LT_EOF >> conftest.$ac_ext
++ {0, (void *) 0}
++};
+
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
--
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++ return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
+
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
- grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++ # Now try linking the two files.
++ mv conftest.$ac_objext conftstm.$ac_objext
++ lt_globsym_save_LIBS=$LIBS
++ lt_globsym_save_CFLAGS=$CFLAGS
++ LIBS="conftstm.$ac_objext"
++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++ pipe_works=yes
++ fi
++ LIBS=$lt_globsym_save_LIBS
++ CFLAGS=$lt_globsym_save_CFLAGS
++ else
++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++ fi
++ else
++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++ fi
+ else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
-- else
++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+ fi
+ else
- with_gnu_ld=no
- wlarc=
-
@@ -5327,19 +5265,36 @@ index d5ecbec..77f71fd 100644
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- fi
--
++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++ cat conftest.$ac_ext >&5
+ fi
++ rm -rf conftest* conftst*
+
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
--else
++ # Do not use the global_symbol_pipe unless it works.
++ if test "$pipe_works" = yes; then
++ break
++ else
++ lt_cv_sys_global_symbol_pipe=
++ fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++ lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++ AC_MSG_RESULT(failed)
+ else
- GXX=no
- with_gnu_ld=no
- wlarc=
--fi
--
++ AC_MSG_RESULT(ok)
+ fi
+
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -5371,11 +5326,39 @@ index d5ecbec..77f71fd 100644
- esac
- done
- esac
--
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
++ nm_file_list_spec='@'
++fi
+
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
--
++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
++ [Take the output of nm and produce a listing of raw symbols and C names])
++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
++ [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_c_name_address],
++ [lt_cv_sys_global_symbol_to_c_name_address], [1],
++ [Transform the output of nm in a C name address pair])
++_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
++ [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([], [nm_file_list_spec], [1],
++ [Specify filename containing input files for $NM])
++]) # _LT_CMD_GLOBAL_SYMBOLS
++
++
++# _LT_COMPILER_PIC([TAGNAME])
++# ---------------------------
++m4_defun([_LT_COMPILER_PIC],
++[m4_require([_LT_TAG_COMPILER])dnl
++_LT_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
@@ -5426,7 +5409,12 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- fi
--
++m4_if([$1], [CXX], [
++ # C++ specific cases for pic, static, wl, etc.
++ if test "$GXX" = yes; then
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -5840,7 +5828,11 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- ;;
++ ;;
++ *)
++ ;;
++ esac
+ ;;
- esac
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5871,7 +5863,10 @@ index d5ecbec..77f71fd 100644
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-- ;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
+ ;;
- icpc*)
- # Intel C++
- with_gnu_ld=yes
@@ -5891,6 +5886,12 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
++ irix5* | irix6* | nonstopux*)
++ case $cc_basename in
++ CC*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ # CC pic flag -KPIC is the default.
+ ;;
+ *)
+ ;;
@@ -5927,9 +5928,56 @@ index d5ecbec..77f71fd 100644
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ interix*)
-+ # This is c89, which is MS Visual C++ (no shared libs)
-+ # Anyone wants to do a port?
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ case $cc_basename in
++ KCC*)
++ # KAI C++ Compiler
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ ;;
++ ecpc* )
++ # old Intel C++ for x86_64 which still supported -KPIC.
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ icpc* )
++ # Intel C++, used to be incompatible with GCC.
++ # ICC 10 doesn't accept -KPIC any more.
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ pgCC* | pgcpp*)
++ # Portland Group C++ compiler
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
++ # Compaq C++
++ # Make sure the PIC flag is empty. It appears that all Alpha
++ # Linux and Compaq Tru64 Unix objects are PIC.
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
++ # IBM XL 8.0, 9.0 on PPC and BlueGene
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
++ ;;
++ esac
;;
- esac
- ;;
@@ -5946,21 +5994,13 @@ index d5ecbec..77f71fd 100644
- cxx*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ irix5* | irix6* | nonstopux*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ # CC pic flag -KPIC is the default.
-+ ;;
-+ *)
-+ ;;
-+ esac
++ lynxos*)
;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
++ m88k*)
+ ;;
- esac
- ;;
- netbsd*)
@@ -6007,54 +6047,12 @@ index d5ecbec..77f71fd 100644
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ mvs*)
+ case $cc_basename in
-+ KCC*)
-+ # KAI C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ ecpc* )
-+ # old Intel C++ for x86_64 which still supported -KPIC.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ icpc* )
-+ # Intel C++, used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgCC* | pgcpp*)
-+ # Portland Group C++ compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
+ cxx*)
-+ # Compaq C++
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-+ # IBM XL 8.0, 9.0 on PPC and BlueGene
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
+ ;;
+ esac
;;
@@ -6062,7 +6060,7 @@ index d5ecbec..77f71fd 100644
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ lynxos*)
++ netbsd*)
;;
- cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -6080,58 +6078,6 @@ index d5ecbec..77f71fd 100644
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ m88k*)
- ;;
-- *)
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
-- else
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-+ mvs*)
-+ case $cc_basename in
-+ cxx*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+ ;;
-+ *)
-+ ;;
-+ esac
- ;;
-- esac
-- ;;
-- osf4* | osf5*)
-- case $cc_basename in
-- KCC*)
-- # Kuck and Associates, Inc. (KAI) C++ Compiler
--
-- # KCC will only create a shared library if the output file
-- # ends with ".so" (or ".sl" for HP-UX), so rename the library
-- # to its proper name (with version) after linking.
-- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
-- # Archives containing C++ object files must be created using
-- # the KAI C++ compiler.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+ netbsd*)
- ;;
-- RCC*)
-- # Rational C++ 2.4.1
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
@@ -6158,32 +6104,10 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
;;
-- cxx*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-- echo "-hidden">> $lib.exp~
-- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-- $rm $lib.exp'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- #
-- # There doesn't appear to be a way to prevent this compiler from
-- # explicitly linking system object files so we need to strip them
-- # from the output so that they don't get included in the library
-- # dependencies.
-- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ psos*)
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6197,6 +6121,26 @@ index d5ecbec..77f71fd 100644
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
++ psos*)
+ ;;
+- esac
+- ;;
+- osf4* | osf5*)
+- case $cc_basename in
+- KCC*)
+- # Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+- # KCC will only create a shared library if the output file
+- # ends with ".so" (or ".sl" for HP-UX), so rename the library
+- # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+- # Archives containing C++ object files must be created using
+- # the KAI C++ compiler.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ solaris*)
+ case $cc_basename in
+ CC* | sunCC*)
@@ -6212,19 +6156,7 @@ index d5ecbec..77f71fd 100644
+ *)
+ ;;
+ esac
- ;;
-- esac
-- ;;
-- psos*)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- sco*)
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case $cc_basename in
-- CC*)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
+ sunos4*)
+ case $cc_basename in
+ CC*)
@@ -6239,10 +6171,7 @@ index d5ecbec..77f71fd 100644
+ *)
+ ;;
+ esac
- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
@@ -6252,12 +6181,8 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
;;
-- esac
-- ;;
-- sunos4*)
-- case $cc_basename in
-- CC*)
-- # Sun C++ 4.x
+- RCC*)
+- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ tandem*)
@@ -6270,46 +6195,35 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
;;
-- lcc*)
-- # Lucid
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cxx*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+- echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+- $rm $lib.exp'
+-
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ vxworks*)
;;
*)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
-- ;;
-- solaris*)
-- case $cc_basename in
-- CC*)
-- # Sun C++ 4.2, 5.x and Centerline C++
-- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- case $host_os in
-- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-- ;;
-- esac
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ ;;
++ esac
+ fi
+],
+[
@@ -6317,7 +6231,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
@@ -6327,15 +6242,10 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
-- # Archives containing C++ object files must be created using
-- # "CC -xar", where "CC" is the Sun C++ compiler. This is
-- # necessary to make sure instantiated templates are included
-- # in the archive.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-- ;;
-- gcx*)
-- # Green Hills C++ Compiler
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ amigaos*)
+ case $host_cpu in
+ powerpc)
@@ -6350,7 +6260,24 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
+ ;;
-+
+
+- else
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+- esac
+- ;;
+- psos*)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
+- CC*)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
@@ -6363,9 +6290,7 @@ index d5ecbec..77f71fd 100644
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
-
-- # The C++ compiler must be used to create the archive.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
@@ -6387,48 +6312,25 @@ index d5ecbec..77f71fd 100644
+ # +Z the default
;;
*)
-- # GNU C++ compiler with Solaris linker
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-- if $CC --version | grep -v '^2\.7' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
+ ;;
+ esac
+ ;;
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-- else
-- # g++ 2.7 appears to require `-G' NOT `-shared' on this
-- # platform.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-- fi
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ enable_shared=no
+ ;;
-
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-- fi
-- ;;
++
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
@@ -6446,14 +6348,16 @@ index d5ecbec..77f71fd 100644
+ ;;
esac
- ;;
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- ;;
-- tandem*)
+- sunos4*)
+
case $cc_basename in
-- NCC*)
-- # NonStop-UX NCC 3.20
+- CC*)
+- # Sun C++ 4.x
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- lcc*)
+- # Lucid
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ nvcc*) # Cuda Compiler Driver 2.2
@@ -6498,39 +6402,50 @@ index d5ecbec..77f71fd 100644
;;
- esac
- ;;
-- vxworks*)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
--esac
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+- solaris*)
+- case $cc_basename in
+- CC*)
+- # Sun C++ 4.2, 5.x and Centerline C++
+- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- case $host_os in
+- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
+- # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+- ;;
+- esac
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
--_LT_AC_TAGVAR(GCC, $1)="$GXX"
--_LT_AC_TAGVAR(LD, $1)="$LD"
+- output_verbose_link_cmd='echo'
+ irix5* | irix6* | nonstopux*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC (with -KPIC) is the default.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-
--AC_LIBTOOL_POSTDEP_PREDEP($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
+
+- # Archives containing C++ object files must be created using
+- # "CC -xar", where "CC" is the Sun C++ compiler. This is
+- # necessary to make sure instantiated templates are included
+- # in the archive.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
@@ -6551,7 +6466,13 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+ ;;
+ ;;
+- gcx*)
+- # Green Hills C++ Compiler
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-
+- # The C++ compiler must be used to create the archive.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
@@ -6575,8 +6496,15 @@ index d5ecbec..77f71fd 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'
-+ ;;
-+ *)
+ ;;
+ *)
+- # GNU C++ compiler with Solaris linker
+- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+- if $CC --version | grep -v '^2\.7' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
@@ -6610,12 +6538,179 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--AC_LIBTOOL_CONFIG($1)
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+- else
+- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+- # platform.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ newsos6)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+- fi
++ *nto* | *qnx*)
++ # QNX uses GNU C++, but need to define -shared option too, otherwise
++ # it will coredump.
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++ ;;
+
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+- fi
+- ;;
+- esac
+- ;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- ;;
+- tandem*)
+- case $cc_basename in
+- NCC*)
+- # NonStop-UX NCC 3.20
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
++ osf3* | osf4* | osf5*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ # All OSF/1 code is PIC.
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
++ rdos*)
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
++ solaris*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
++ ;;
++
++ sunos4*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ sysv4 | sysv4.2uw2* | sysv4.3*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ sysv4*MP*)
++ if test -d /usr/nec ;then
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ fi
++ ;;
++
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ unicos*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
++ uts4*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ *)
++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
+ esac
+- ;;
+- vxworks*)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++])
++case $host_os in
++ # For platforms which do not support PIC, -DPIC is meaningless:
++ *djgpp*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++AC_CACHE_CHECK([for $compiler option to produce PIC],
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
++ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
++ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
++ "" | " "*) ;;
++ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++ esac],
++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
++ [Additional compiler flags for building library objects])
+
+-AC_LIBTOOL_CONFIG($1)
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++ [How to pass a linker flag through the compiler])
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
++ [Compiler flag to prevent dynamic linking])
++])# _LT_COMPILER_PIC
+
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
@@ -6685,20 +6780,10 @@ index d5ecbec..77f71fd 100644
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+ *nto* | *qnx*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-
+-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-+ osf3* | osf4* | osf5*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All OSF/1 code is PIC.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-
+-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
@@ -6709,10 +6794,7 @@ index d5ecbec..77f71fd 100644
- else
- prev=
- fi
-+ rdos*)
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-
+-
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
@@ -6736,17 +6818,7 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- ;;
-+ solaris*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+ esac
-+ ;;
-
+-
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
@@ -6754,12 +6826,7 @@ index d5ecbec..77f71fd 100644
- pre_test_object_deps_done=yes
- continue
- fi
-+ sunos4*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
+-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
- _LT_AC_TAGVAR(predep_objects, $1)="$p"
@@ -6774,166 +6841,9 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- ;;
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
-- *) ;; # Ignore the rest.
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-
-- esac
-- done
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
-- # Clean up.
-- rm -f a.out a.exe
--else
-- echo "libtool.m4: error: problem compiling $1 test program"
--fi
-+ unicos*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-
--$rm -f confest.$objext
-+ uts4*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
--# PORTME: override above test on systems where it is broken
--ifelse([$1],[CXX],
--[case $host_os in
--solaris*)
-- case $cc_basename in
-- CC*)
-- # Adding this requires a known-good setup of shared libraries for
-- # Sun compiler versions before 5.6, else PIC objects from an old
-- # archive will be linked into the output, leading to subtle bugs.
-- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-- ;;
-- esac
--esac
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
-+ fi
- ])
--
--case " $_LT_AC_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+ ;;
- esac
--])# AC_LIBTOOL_POSTDEP_PREDEP
--
--# AC_LIBTOOL_LANG_F77_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
-
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+AC_CACHE_CHECK([for $compiler option to produce PIC],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
--# Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+ "" | " "*) ;;
-+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+ esac],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+ [Additional compiler flags for building library objects])
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+ [How to pass a linker flag through the compiler])
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+ $lt_tmp_static_flag,
-+ [],
-+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+ [Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+- *) ;; # Ignore the rest.
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
@@ -6974,12 +6884,34 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ ;;
-+ esac
+ esac
+- done
+-
+- # Clean up.
+- rm -f a.out a.exe
+-else
+- echo "libtool.m4: error: problem compiling $1 test program"
+-fi
+-
+-$rm -f confest.$objext
+-
+-# PORTME: override above test on systems where it is broken
+-ifelse([$1],[CXX],
+-[case $host_os in
+-solaris*)
+- case $cc_basename in
+- CC*)
+- # Adding this requires a known-good setup of shared libraries for
+- # Sun compiler versions before 5.6, else PIC objects from an old
+- # archive will be linked into the output, leading to subtle bugs.
+- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
+ ;;
+ esac
+-esac
+-])
+], [
+ runpath_var=
+ _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7022,8 +6954,10 @@ index d5ecbec..77f71fd 100644
+dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -7042,23 +6976,38 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ _LT_TAGVAR(ld_shlibs, $1)=yes
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
-- test "$enable_shared" = yes && enable_static=no
-- if test -n "$RANLIB"; then
-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
-- postinstall_cmds='$RANLIB $lib'
-- fi
-- ;;
--aix4* | aix5*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
+-# Source file extension for f77 test sources.
+-ac_ext=f
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
@@ -7082,31 +7031,17 @@ index d5ecbec..77f71fd 100644
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
- fi
-- ;;
--esac
--AC_MSG_RESULT([$enable_shared])
--
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
++ fi
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--_LT_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
@@ -7129,6 +7064,8 @@ index d5ecbec..77f71fd 100644
+ *) supports_anon_versioning=yes ;;
+ esac
+-# Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[[3-9]]*)
@@ -7137,7 +7074,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
--AC_LIBTOOL_CONFIG($1)
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
@@ -7145,13 +7083,19 @@ index d5ecbec..77f71fd 100644
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+_LT_EOF
+ fi
+ ;;
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+ amigaos*)
+ case $host_cpu in
+ powerpc)
@@ -7167,14 +7111,8 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -7186,8 +7124,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Source file extension for Java test sources.
--ac_ext=java
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -7215,16 +7153,32 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
+-aix4* | aix5*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -7240,8 +7194,7 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
@@ -7290,8 +7243,8 @@ index d5ecbec..77f71fd 100644
+ esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -7299,9 +7252,13 @@ index d5ecbec..77f71fd 100644
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+ case $cc_basename in
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
@@ -7321,12 +7278,6 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7337,14 +7288,15 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-AC_LIBTOOL_CONFIG($1)
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
@@ -7352,15 +7304,6 @@ index d5ecbec..77f71fd 100644
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -7370,16 +7313,22 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--AC_LIBTOOL_CONFIG($1)
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# Source file extension for Java test sources.
+-ac_ext=java
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
@@ -7387,6 +7336,9 @@ index d5ecbec..77f71fd 100644
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+_LT_EOF
+ ;;
+ *)
@@ -7405,14 +7357,8 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# AC_LIBTOOL_LANG_RC_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
+ sunos4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
@@ -7420,8 +7366,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# Source file extension for RC test sources.
--ac_ext=rc
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -7432,9 +7378,8 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -7458,8 +7403,9 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
@@ -7479,8 +7425,12 @@ index d5ecbec..77f71fd 100644
+ fi
+ aix_use_runtimelinking=no
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
@@ -7494,28 +7444,28 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ _LT_TAGVAR(archive_cmds, $1)=''
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -7567,7 +7517,7 @@ index d5ecbec..77f71fd 100644
-AC_LANG_RESTORE
-CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
@@ -7624,92 +7574,20 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then create an initial libtool script
--# with a default configuration from the untagged config vars. Otherwise
--# add code to config.status for appending the configuration named by
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
-- # See if we are running on zsh, and set the options which allow our commands through
-- # without removal of \ escapes.
-- if test -n "${ZSH_VERSION+set}" ; then
-- setopt NO_GLOB_SUBST
-- fi
-- # Now quote all the things that may contain metacharacters while being
-- # careful not to overquote the AC_SUBSTed values. We take copies of the
-- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-- SED SHELL STRIP \
-- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-- deplibs_check_method reload_flag reload_cmds need_locks \
-- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-- lt_cv_sys_global_symbol_to_c_name_address \
-- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-- old_postinstall_cmds old_postuninstall_cmds \
-- _LT_AC_TAGVAR(compiler, $1) \
-- _LT_AC_TAGVAR(CC, $1) \
-- _LT_AC_TAGVAR(LD, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-- _LT_AC_TAGVAR(old_archive_cmds, $1) \
-- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-- _LT_AC_TAGVAR(predep_objects, $1) \
-- _LT_AC_TAGVAR(postdep_objects, $1) \
-- _LT_AC_TAGVAR(predeps, $1) \
-- _LT_AC_TAGVAR(postdeps, $1) \
-- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-- _LT_AC_TAGVAR(archive_cmds, $1) \
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-- _LT_AC_TAGVAR(postinstall_cmds, $1) \
-- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-- _LT_AC_TAGVAR(no_undefined_flag, $1) \
-- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-- _LT_AC_TAGVAR(hardcode_automatic, $1) \
-- _LT_AC_TAGVAR(module_cmds, $1) \
-- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-- _LT_AC_TAGVAR(exclude_expsyms, $1) \
-- _LT_AC_TAGVAR(include_expsyms, $1); do
--
-- case $var in
-- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-- _LT_AC_TAGVAR(archive_cmds, $1) | \
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-- _LT_AC_TAGVAR(module_cmds, $1) | \
-- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-- extract_expsyms_cmds | reload_cmds | finish_cmds | \
-- postinstall_cmds | postuninstall_cmds | \
-- old_postinstall_cmds | old_postuninstall_cmds | \
-- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-- # Double-quote double-evaled strings.
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
+ bsdi[[45]]*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-- *)
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+
++ ;;
+
+-# Source file extension for RC test sources.
+-ac_ext=rc
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
@@ -7773,34 +7651,25 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+ esac
- ;;
-- esac
-- done
++ ;;
-- case $lt_echo in
-- *'\[$]0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-- ;;
-- esac
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
--ifelse([$1], [],
-- [cfgfile="${ofile}T"
-- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-- $rm -f "$cfgfile"
-- AC_MSG_NOTICE([creating $ofile])],
-- [cfgfile="$ofile"])
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+ dgux*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
-- cat <<__EOF__ >> "$cfgfile"
--ifelse([$1], [],
--[#! $SHELL
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
+ # 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
@@ -7812,40 +7681,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# A sed program that does not truncate output.
--SED=$lt_SED
--
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2.*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -7854,9 +7691,9 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@@ -7865,8 +7702,13 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# The names of the tagged configurations supported by this script.
--available_tags=
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ hpux9*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -7876,16 +7718,14 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
-
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-AC_LIBTOOL_CONFIG($1)
+ hpux10*)
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -7904,8 +7744,9 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
+ hpux11*)
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
@@ -7943,8 +7784,6 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
@@ -7955,18 +7794,96 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars. Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+- # See if we are running on zsh, and set the options which allow our commands through
+- # without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}" ; then
+- setopt NO_GLOB_SUBST
+- fi
+- # Now quote all the things that may contain metacharacters while being
+- # careful not to overquote the AC_SUBSTed values. We take copies of the
+- # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+- SED SHELL STRIP \
+- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+- deplibs_check_method reload_flag reload_cmds need_locks \
+- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+- lt_cv_sys_global_symbol_to_c_name_address \
+- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+- old_postinstall_cmds old_postuninstall_cmds \
+- _LT_AC_TAGVAR(compiler, $1) \
+- _LT_AC_TAGVAR(CC, $1) \
+- _LT_AC_TAGVAR(LD, $1) \
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+- _LT_AC_TAGVAR(old_archive_cmds, $1) \
+- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+- _LT_AC_TAGVAR(predep_objects, $1) \
+- _LT_AC_TAGVAR(postdep_objects, $1) \
+- _LT_AC_TAGVAR(predeps, $1) \
+- _LT_AC_TAGVAR(postdeps, $1) \
+- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+- _LT_AC_TAGVAR(archive_cmds, $1) \
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+- _LT_AC_TAGVAR(postinstall_cmds, $1) \
+- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+- _LT_AC_TAGVAR(no_undefined_flag, $1) \
+- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+- _LT_AC_TAGVAR(hardcode_automatic, $1) \
+- _LT_AC_TAGVAR(module_cmds, $1) \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+- _LT_AC_TAGVAR(exclude_expsyms, $1) \
+- _LT_AC_TAGVAR(include_expsyms, $1); do
+-
+- case $var in
+- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+- _LT_AC_TAGVAR(archive_cmds, $1) | \
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+- _LT_AC_TAGVAR(module_cmds, $1) | \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+- extract_expsyms_cmds | reload_cmds | finish_cmds | \
+- postinstall_cmds | postuninstall_cmds | \
+- old_postinstall_cmds | old_postuninstall_cmds | \
+- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+- # Double-quote double-evaled strings.
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ fi
-+ ;;
-
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+ ;;
+- *)
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -8003,10 +7920,15 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
+ ;;
+- esac
+- done
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+- case $lt_echo in
+- *'\[$]0 --fallback-echo"')
+- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+- ;;
+- esac
+ netbsd*)
+ 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
@@ -8018,8 +7940,12 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-ifelse([$1], [],
+- [cfgfile="${ofile}T"
+- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+- $rm -f "$cfgfile"
+- AC_MSG_NOTICE([creating $ofile])],
+- [cfgfile="$ofile"])
+ newsos6)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -8028,17 +7954,40 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+- cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
+ *nto* | *qnx*)
+ ;;
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -8066,8 +8015,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# A sed program that does not truncate output.
+-SED=$lt_SED
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -8076,9 +8025,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e 1s/^X//"
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -8092,8 +8040,9 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
--# A C compiler.
--LTCC=$lt_LTCC
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 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}\*'
@@ -8105,8 +8054,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
@@ -8114,8 +8063,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ solaris*)
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test "$GCC" = yes; then
@@ -8158,8 +8107,7 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
@@ -8174,8 +8122,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+ sysv4)
+ case $host_vendor in
+ sni)
@@ -8198,16 +8146,16 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+ sysv4.3*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+ ;;
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -8218,16 +8166,16 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# A symbol stripping program
--STRIP=$lt_STRIP
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8237,8 +8185,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
@@ -8256,8 +8204,10 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8267,24 +8217,26 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Used on cygwin: assembler.
--AS="$AS"
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ uts4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+ *)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -8297,19 +8249,19 @@ index d5ecbec..77f71fd 100644
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-# A C compiler.
+-LTCC=$lt_LTCC
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+ [The commands to extract the exported symbol list from a shared archive])
--# Old archive suffix (normally "a").
--libext="$libext"
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+#
+# Do we need to explicitly link libc?
+#
@@ -8318,8 +8270,8 @@ index d5ecbec..77f71fd 100644
+ # Assume -lc should be added
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_TAGVAR(archive_cmds, $1) in
+ *'~'*)
@@ -8367,8 +8319,8 @@ index d5ecbec..77f71fd 100644
+ ;;
+esac
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+ [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
@@ -8454,43 +8406,42 @@ index d5ecbec..77f71fd 100644
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Source file extension for C test sources.
+ac_ext=c
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
--# Do we need a version for libraries?
--need_version=$need_version
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Used on cygwin: assembler.
+-AS="$AS"
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
@@ -8520,8 +8471,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+ aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
@@ -8530,26 +8481,27 @@ index d5ecbec..77f71fd 100644
+ esac
+ AC_MSG_RESULT([$enable_shared])
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+-# Old archive suffix (normally "a").
+-libext="$libext"
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
@@ -8567,8 +8519,8 @@ index d5ecbec..77f71fd 100644
+ _lt_caught_CXX_error=yes
+fi
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -8594,13 +8546,14 @@ index d5ecbec..77f71fd 100644
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+# Source file extension for C++ test sources.
+ac_ext=cpp
--# Library versioning type.
--version_type=$version_type
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
@@ -8648,8 +8601,8 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
@@ -8659,44 +8612,37 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+ LT_PATH_LD
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+-# Do we need a version for libraries?
+-need_version=$need_version
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
@@ -8716,26 +8662,23 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ else
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
+ fi
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ # PORTME: fill in a description of your system's C++ link characteristics
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -8769,16 +8712,14 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
@@ -8832,9 +8773,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ fi
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
@@ -8878,7 +8818,9 @@ index d5ecbec..77f71fd 100644
+ fi
+ fi
+ ;;
-+
+
+-# Library versioning type.
+-version_type=$version_type
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -8890,9 +8832,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+ chorus*)
+ case $cc_basename in
+ *)
@@ -8902,8 +8843,9 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+ cygwin* | mingw* | pw32* | cegcc*)
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
@@ -8978,8 +8920,8 @@ index d5ecbec..77f71fd 100644
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+ dgux*)
+ case $cc_basename in
+ ec++*)
@@ -8998,42 +8940,50 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ freebsd2.*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ freebsd-elf*)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+ gnu*)
+ ;;
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9071,8 +9021,9 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
@@ -9100,8 +9051,9 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -9152,8 +9104,9 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -9196,15 +9149,17 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
@@ -9280,8 +9235,8 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -9291,17 +9246,12 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $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.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -9351,24 +9301,22 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ lynxos*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+ m88k*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+ mvs*)
+ case $cc_basename in
+ cxx*)
@@ -9382,9 +9330,8 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
@@ -9397,23 +9344,21 @@ index d5ecbec..77f71fd 100644
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ *nto* | *qnx*)
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -9432,8 +9377,8 @@ index d5ecbec..77f71fd 100644
+ fi
+ ;;
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
@@ -9477,12 +9422,12 @@ index d5ecbec..77f71fd 100644
+ ;;
+ esac
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -9521,15 +9466,15 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+ psos*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+ sunos4*)
+ case $cc_basename in
+ CC*)
@@ -9549,8 +9494,9 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+ solaris*)
+ case $cc_basename in
+ CC* | sunCC*)
@@ -9574,12 +9520,14 @@ index d5ecbec..77f71fd 100644
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $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.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+ output_verbose_link_cmd='func_echo_all'
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -9590,9 +9538,9 @@ index d5ecbec..77f71fd 100644
+ # Green Hills C++ Compiler
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+ # The C++ compiler must be used to create the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
@@ -9634,17 +9582,18 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--__EOF__
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
--ifelse([$1],[], [
-- case $host_os in
-- aix3*)
-- cat <<\EOF >> "$cfgfile"
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9657,16 +9606,9 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
--# AIX sometimes has problems with the GCC collect2 program. For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
-- COLLECT_NAMES=
-- export COLLECT_NAMES
--fi
--EOF
-- ;;
-- esac
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
@@ -9684,11 +9626,9 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
-- # We use sed instead of cat because bash on DJGPP gets confused if
-- # if finds mixed CR/LF and LF-only lines. Since sed operates in
-- # text mode, it properly converts lines to CR/LF. This bash problem
-- # is reportedly fixed, but why not run on old versions too?
-- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9705,20 +9645,8 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
-- mv -f "$cfgfile" "$ofile" || \
-- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-- chmod +x "$ofile"
--])
--else
-- # If there is no Makefile yet, we rely on a make rule to execute
-- # `config.status --recheck' to rerun these tests and create the
-- # libtool script then.
-- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-- if test -f "$ltmain_in"; then
-- test -f Makefile && make "$ltmain"
-- fi
--fi
--])# AC_LIBTOOL_CONFIG
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ tandem*)
+ case $cc_basename in
+ NCC*)
@@ -9733,22 +9661,23 @@ index d5ecbec..77f71fd 100644
+ esac
+ ;;
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
--# -------------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
--_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
@@ -9782,18 +9711,16 @@ index d5ecbec..77f71fd 100644
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
--if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
-- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-- lt_cv_prog_compiler_rtti_exceptions,
-- [-fno-rtti -fno-exceptions], [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
--fi
--])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
@@ -9817,19 +9744,10 @@ index d5ecbec..77f71fd 100644
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
--# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
- # ---------------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
--[AC_REQUIRE([AC_CANONICAL_HOST])
--AC_REQUIRE([AC_PROG_NM])
--AC_REQUIRE([AC_OBJEXT])
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--AC_MSG_CHECKING([command to parse $NM output from $compiler object])
--AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
--[
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix. What could be older than Ultrix?!! ;)]
++# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
@@ -9844,8 +9762,8 @@ index d5ecbec..77f71fd 100644
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
--# Character class describing NM global symbol codes.
--symcode='[[BCDEGRST]]'
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library. It's possible we should let each
@@ -9895,8 +9813,9 @@ index d5ecbec..77f71fd 100644
+_LT_EOF
+])
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
@@ -9904,37 +9823,39 @@ index d5ecbec..77f71fd 100644
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+-__EOF__
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+-ifelse([$1],[], [
+- case $host_os in
+- aix3*)
+- cat <<\EOF >> "$cfgfile"
+ # Sentinel used to keep track of whether or not we are before
+ # the conftest object file.
+ pre_test_object_deps_done=no
--# Define system-specific variables.
--case $host_os in
--aix*)
-- symcode='[[BCDT]]'
-- ;;
--cygwin* | mingw* | pw32*)
-- symcode='[[ABCDGISTW]]'
-- ;;
--hpux*) # Its linker distinguishes data from code symbols
-- if test "$host_cpu" = ia64; then
-- symcode='[[ABCDEGRST]]'
-- fi
-- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+-# AIX sometimes has problems with the GCC collect2 program. For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+-fi
+-EOF
+- ;;
+- esac
+ for p in `eval "$output_verbose_link_cmd"`; do
+ case ${prev}${p} in
-+
+
+- # We use sed instead of cat because bash on DJGPP gets confused if
+- # if finds mixed CR/LF and LF-only lines. Since sed operates in
+- # text mode, it properly converts lines to CR/LF. This bash problem
+- # is reportedly fixed, but why not run on old versions too?
+- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
@@ -9943,7 +9864,21 @@ index d5ecbec..77f71fd 100644
+ prev=$p
+ continue
+ fi
-+
+
+- mv -f "$cfgfile" "$ofile" || \
+- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+- chmod +x "$ofile"
+-])
+-else
+- # If there is no Makefile yet, we rely on a make rule to execute
+- # `config.status --recheck' to rerun these tests and create the
+- # libtool script then.
+- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+- if test -f "$ltmain_in"; then
+- test -f Makefile && make "$ltmain"
+- fi
+-fi
+-])# AC_LIBTOOL_CONFIG
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
@@ -9979,7 +9914,7 @@ index d5ecbec..77f71fd 100644
+ fi
+ prev=
+ ;;
-+
+
+ *.lto.$objext) ;; # Ignore GCC LTO objects
+ *.$objext)
+ # This assumes that the test object file only shows up
@@ -9988,7 +9923,11 @@ index d5ecbec..77f71fd 100644
+ pre_test_object_deps_done=yes
+ continue
+ fi
-+
+
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+ _LT_TAGVAR(predep_objects, $1)="$p"
@@ -10003,21 +9942,44 @@ index d5ecbec..77f71fd 100644
+ fi
+ fi
+ ;;
-+
+
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ *) ;; # Ignore the rest.
-+
+
+-if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ esac
+ done
-+
+
+- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+- lt_cv_prog_compiler_rtti_exceptions,
+- [-fno-rtti -fno-exceptions], [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+ # Clean up.
+ rm -f a.out a.exe
+else
+ echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
+ fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
-+
+
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+-[
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
@@ -10027,26 +9989,11 @@ index d5ecbec..77f71fd 100644
+ _LT_TAGVAR(predep_objects,$1)=
+ _LT_TAGVAR(postdep_objects,$1)=
+ _LT_TAGVAR(postdeps,$1)=
- ;;
-+
- linux*)
-- if test "$host_cpu" = ia64; then
-- symcode='[[ABCDGIRSTW]]'
-- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-- fi
-- ;;
--irix* | nonstopux*)
-- symcode='[[BCDEGRST]]'
-- ;;
--osf*)
-- symcode='[[BCDEGQRST]]'
-- ;;
--solaris* | sysv5*)
-- symcode='[[BDRT]]'
-- ;;
--sysv4)
-- symcode='[[DFNSTU]]'
++ ;;
+
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
@@ -10060,20 +10007,18 @@ index d5ecbec..77f71fd 100644
+ solaris_use_stlport4=yes
+ ;;
+ esac
-+
+
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
- ;;
--esac
++ ;;
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $build_os in
--mingw*)
-- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+solaris*)
+ case $cc_basename in
+ CC* | sunCC*)
@@ -10086,7 +10031,40 @@ index d5ecbec..77f71fd 100644
+ solaris_use_stlport4=yes
+ ;;
+ esac
-+
+
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+- symcode='[[BCDT]]'
+- ;;
+-cygwin* | mingw* | pw32*)
+- symcode='[[ABCDGISTW]]'
+- ;;
+-hpux*) # Its linker distinguishes data from code symbols
+- if test "$host_cpu" = ia64; then
+- symcode='[[ABCDEGRST]]'
+- fi
+- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+- ;;
+-linux*)
+- if test "$host_cpu" = ia64; then
+- symcode='[[ABCDGIRSTW]]'
+- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+- fi
+- ;;
+-irix* | nonstopux*)
+- symcode='[[BCDEGRST]]'
+- ;;
+-osf*)
+- symcode='[[BCDEGQRST]]'
+- ;;
+-solaris* | sysv5*)
+- symcode='[[BDRT]]'
+- ;;
+-sysv4)
+- symcode='[[DFNSTU]]'
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
@@ -10099,10 +10077,12 @@ index d5ecbec..77f71fd 100644
esac
+])
--# If we're using GNU nm, then use its standard symbol codes.
--case `$NM -V 2>&1` in
--*GNU* | *'with BFD'*)
-- symcode='[[ABCDGIRSTW]]' ;;
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+- ;;
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -10135,8 +10115,11 @@ index d5ecbec..77f71fd 100644
+ _lt_disable_F77=yes
+fi
--# Try without a prefix undercore, then with it.
--for ac_symprfx in "" "_"; do
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+- symcode='[[ABCDGIRSTW]]' ;;
+-esac
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
@@ -10159,13 +10142,13 @@ index d5ecbec..77f71fd 100644
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-- symxfrm="\\1 $ac_symprfx\\2 \\2"
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+# Source file extension for f77 test sources.
+ac_ext=f
-- # Write the raw and C identifiers.
-- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+- symxfrm="\\1 $ac_symprfx\\2 \\2"
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
@@ -10182,8 +10165,8 @@ index d5ecbec..77f71fd 100644
+ end
+"
-- # Check to see that the pipe works correctly.
-- pipe_works=no
+- # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
@@ -10211,6 +10194,11 @@ index d5ecbec..77f71fd 100644
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+- # Check to see that the pipe works correctly.
+- pipe_works=no
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
+
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
@@ -10223,19 +10211,6 @@ index d5ecbec..77f71fd 100644
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-
-- if AC_TRY_EVAL(ac_compile); then
-- # Now try to grab the symbols.
-- nlist=conftest.nm
-- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-- # Try sorting and uniquifying the output.
-- if sort "$nlist" | uniq > "$nlist"T; then
-- mv -f "$nlist"T "$nlist"
-- else
-- rm -f "$nlist"T
-- fi
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
@@ -10281,6 +10256,19 @@ index d5ecbec..77f71fd 100644
+ CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+- if AC_TRY_EVAL(ac_compile); then
+- # Now try to grab the symbols.
+- nlist=conftest.nm
+- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+- # Try sorting and uniquifying the output.
+- if sort "$nlist" | uniq > "$nlist"T; then
+- mv -f "$nlist"T "$nlist"
+- else
+- rm -f "$nlist"T
+- fi
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
+
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
@@ -10288,12 +10276,17 @@ index d5ecbec..77f71fd 100644
-#ifdef __cplusplus
-extern "C" {
-#endif
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++# _LT_LANG_FC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for a Fortran compiler are
++# suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_FC_CONFIG],
++[AC_LANG_PUSH(Fortran)
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
@@ -10302,13 +10295,9 @@ index d5ecbec..77f71fd 100644
-# define lt_ptr_t char *
-# define const
-#endif
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_LANG_PUSH(Fortran)
++if test -z "$FC" || test "X$FC" = "Xno"; then
++ _lt_disable_FC=yes
++fi
-/* The mapping between symbol names and symbols. */
-const struct {
@@ -10322,39 +10311,6 @@ index d5ecbec..77f71fd 100644
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+ _lt_disable_FC=yes
-+fi
-
--#ifdef __cplusplus
--}
--#endif
--EOF
-- # Now try linking the two files.
-- mv conftest.$ac_objext conftstm.$ac_objext
-- lt_save_LIBS="$LIBS"
-- lt_save_CFLAGS="$CFLAGS"
-- LIBS="conftstm.$ac_objext"
-- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-- pipe_works=yes
-- fi
-- LIBS="$lt_save_LIBS"
-- CFLAGS="$lt_save_CFLAGS"
-- else
-- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-- fi
-- else
-- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-- fi
-- else
-- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-- fi
-- else
-- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-- cat conftest.$ac_ext >&5
-- fi
-- rm -f conftest* conftst*
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
@@ -10396,6 +10352,112 @@ index d5ecbec..77f71fd 100644
+ end
+"
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+- # Now try linking the two files.
+- mv conftest.$ac_objext conftstm.$ac_objext
+- lt_save_LIBS="$LIBS"
+- lt_save_CFLAGS="$CFLAGS"
+- LIBS="conftstm.$ac_objext"
+- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+- pipe_works=yes
+- fi
+- LIBS="$lt_save_LIBS"
+- CFLAGS="$lt_save_CFLAGS"
+- else
+- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++ # Code to be used in simple link tests
++ lt_simple_link_test_code="\
++ program t
++ end
++"
++
++ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++ _LT_TAG_COMPILER
++
++ # save warnings/boilerplate of simple test code
++ _LT_COMPILER_BOILERPLATE
++ _LT_LINKER_BOILERPLATE
++
++ # Allow CC to be a program name with arguments.
++ lt_save_CC="$CC"
++ lt_save_GCC=$GCC
++ lt_save_CFLAGS=$CFLAGS
++ CC=${FC-"f95"}
++ CFLAGS=$FCFLAGS
++ compiler=$CC
++ GCC=$ac_cv_fc_compiler_gnu
++
++ _LT_TAGVAR(compiler, $1)=$CC
++ _LT_CC_BASENAME([$compiler])
++
++ if test -n "$compiler"; then
++ AC_MSG_CHECKING([if libtool supports shared libraries])
++ AC_MSG_RESULT([$can_build_shared])
++
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
++
++ # On AIX, shared libraries and static libraries use the same namespace, and
++ # are all built from PIC.
++ case $host_os in
++ aix3*)
++ test "$enable_shared" = yes && enable_static=no
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
++ ;;
++ aix[[4-9]]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+- else
+- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+- fi
+- else
+- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+- fi
+- else
+- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+- cat conftest.$ac_ext >&5
+- fi
+- rm -f conftest* conftst*
++ ;;
++ esac
++ AC_MSG_RESULT([$enable_shared])
++
++ AC_MSG_CHECKING([whether to build static libraries])
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ AC_MSG_RESULT([$enable_static])
++
++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++ _LT_TAGVAR(LD, $1)="$LD"
++
++ ## CAVEAT EMPTOR:
++ ## There is no encapsulation within the following macros, do not change
++ ## the running order or otherwise move them around unless you know exactly
++ ## what you are doing...
++ _LT_SYS_HIDDEN_LIBDEPS($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_SYS_DYNAMIC_LINKER($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++ fi # test -n "$compiler"
++
++ GCC=$lt_save_GCC
++ CC=$lt_save_CC
++ CFLAGS=$lt_save_CFLAGS
++fi # test "$_lt_disable_FC" != yes
+
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
@@ -10406,21 +10468,142 @@ index d5ecbec..77f71fd 100644
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
--fi
++AC_LANG_POP
++])# _LT_LANG_FC_CONFIG
++
++
++# _LT_LANG_GCJ_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Java Compiler compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GCJ_CONFIG],
++[AC_REQUIRE([LT_PROG_GCJ])dnl
++AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GCJ-"gcj"}
++CFLAGS=$GCJFLAGS
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
++
++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
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
--fi
++
++AC_LANG_RESTORE
++
++GCC=$lt_save_GCC
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
++])# _LT_LANG_GCJ_CONFIG
++
++
++# _LT_LANG_GO_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Go compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++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
++
++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_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_COMPILER
++AC_LANG_RESTORE
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
@@ -10428,9 +10611,10 @@ index d5ecbec..77f71fd 100644
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-+ # save warnings/boilerplate of simple test code
-+ _LT_COMPILER_BOILERPLATE
-+ _LT_LINKER_BOILERPLATE
++GCC=$lt_save_GCC
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
++])# _LT_LANG_GO_CONFIG
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
@@ -10438,28 +10622,8 @@ index d5ecbec..77f71fd 100644
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ # Allow CC to be a program name with arguments.
-+ lt_save_CC="$CC"
-+ lt_save_GCC=$GCC
-+ lt_save_CFLAGS=$CFLAGS
-+ CC=${FC-"f95"}
-+ CFLAGS=$FCFLAGS
-+ compiler=$CC
-+ GCC=$ac_cv_fc_compiler_gnu
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
- case $host_os in
+- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
@@ -10519,17 +10683,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
- fi
+- fi
- ;;
- chorus*)
- case $cc_basename in
@@ -10726,182 +10880,7 @@ index d5ecbec..77f71fd 100644
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-+ ;;
- esac
-- fi
--],
--[
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## CAVEAT EMPTOR:
-+ ## There is no encapsulation within the following macros, do not change
-+ ## the running order or otherwise move them around unless you know exactly
-+ ## what you are doing...
-+ _LT_SYS_HIDDEN_LIBDEPS($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ GCC=$lt_save_GCC
-+ CC=$lt_save_CC
-+ CFLAGS=$lt_save_CFLAGS
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+CFLAGS=$GCJFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_GO_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Go compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+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
-+
-+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
-+
-+
+- esac
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
@@ -11016,13 +10995,7 @@ index d5ecbec..77f71fd 100644
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
-
-- case $host_os in
-- aix*)
-- # All AIX code is PIC.
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
@@ -11066,7 +11039,7 @@ index d5ecbec..77f71fd 100644
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
++ fi
+ done
+ done
+done
@@ -11084,7 +11057,12 @@ index d5ecbec..77f71fd 100644
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
-+ fi
+ fi
+-],
+-[
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
@@ -11502,15 +11480,10 @@ index d5ecbec..77f71fd 100644
+ fi
+ done
+ IFS="$lt_save_ifs"
- ;;
++ ;;
+ esac],
+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-- amigaos*)
-- # FIXME: we need at least 68020 code to build shared libraries, but
-- # adding the `-m68020' flag to GCC prevents building anything better,
-- # like `-m68040'.
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++
+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
+ [Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
@@ -11588,8 +11561,21 @@ index d5ecbec..77f71fd 100644
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
-+
-+
+
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- fi
+- ;;
+
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
@@ -12161,10 +12147,7 @@ index d5ecbec..77f71fd 100644
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+# serial 5 lt~obsolete.m4
-
--EOF
-- fi
-- ;;
++
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
@@ -12276,25 +12259,13 @@ index d5ecbec..77f71fd 100644
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
-
-- amigaos*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--
-- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-- # that the semantics of dynamic libraries on AmigaOS, at least up
-- # to version 4, is to share data among multiple programs linked
-- # with the same dynamic library. Since this doesn't match the
-- # behavior of shared libraries on other platforms, we can't use
-- # them.
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
++
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -12313,17 +12284,7 @@ index d5ecbec..77f71fd 100644
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
-
-- beos*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-- # support --undefined. This deserves some investigation. FIXME
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
++
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
@@ -12343,6 +12304,74 @@ index d5ecbec..77f71fd 100644
+ $3])dnl
+fi])
+-EOF
+- fi
+- ;;
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes ],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
+
+- amigaos*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-
+- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+- # that the semantics of dynamic libraries on AmigaOS, at least up
+- # to version 4, is to share data among multiple programs linked
+- # with the same dynamic library. Since this doesn't match the
+- # behavior of shared libraries on other platforms, we can't use
+- # them.
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+
+- beos*)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+- # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
@@ -12367,46 +12396,8 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12427,8 +12418,8 @@ index d5ecbec..77f71fd 100644
- tmp_addflag=' -nofor_main' ;;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -12440,8 +12431,9 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -12452,33 +12444,31 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-
-- solaris* | sysv5*)
-- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- cat <<EOF 1>&2
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+- solaris* | sysv5*)
+- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cat <<EOF 1>&2
++ m4_default([$4], [AC_MSG_ERROR(
++[Package requirements ($2) were not met:
+
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
++$$1_PKG_ERRORS
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12488,7 +12478,8 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+$$1_PKG_ERRORS
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -12496,8 +12487,14 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++_PKG_TEXT])[]dnl
++ ])
++elif test $pkg_failed = untried; then
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12508,14 +12505,7 @@ index d5ecbec..77f71fd 100644
- fi
- ;;
- esac
-+_PKG_TEXT])
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++_PKG_TEXT
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
@@ -12539,7 +12529,61 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-+_PKG_TEXT
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
++ ])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ $3
++fi[]dnl
++])# PKG_CHECK_MODULES
++
++
++# PKG_INSTALLDIR(DIRECTORY)
++# -------------------------
++# Substitutes the variable pkgconfigdir as the location where a module
++# should install pkg-config .pc files. By default the directory is
++# $libdir/pkgconfig, but the default can be changed by passing
++# DIRECTORY. The user can override through the --with-pkgconfigdir
++# parameter.
++AC_DEFUN([PKG_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++ [pkg-config installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([pkgconfigdir],
++ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
++ [with_pkgconfigdir=]pkg_default)
++AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++]) dnl PKG_INSTALLDIR
++
++
++# PKG_NOARCH_INSTALLDIR(DIRECTORY)
++# -------------------------
++# Substitutes the variable noarch_pkgconfigdir as the location where a
++# module should install arch-independent pkg-config .pc files. By
++# default the directory is $datadir/pkgconfig, but the default can be
++# changed by passing DIRECTORY. The user can override through the
++# --with-noarch-pkgconfigdir parameter.
++AC_DEFUN([PKG_NOARCH_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([noarch-pkgconfigdir],
++ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
++ [with_noarch_pkgconfigdir=]pkg_default)
++AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++]) dnl PKG_NOARCH_INSTALLDIR
++
++# Copyright (C) 2002-2012 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.
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
@@ -12557,22 +12601,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_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
- aix_use_runtimelinking=no
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-+
-+# 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 8
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -12585,29 +12614,22 @@ index d5ecbec..77f71fd 100644
- fi
- done
- esac
-+# serial 1
-
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
++[am__api_version='1.12'
+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.6], [],
++m4_if([$1], [1.12.2], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
-- # When large executables or shared objects are built, AIX ld can
-- # have problems creating the table of contents. If linking a library
-- # or program results in "error TOC overflow" add -mminimal-toc to
-- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
@@ -12615,20 +12637,27 @@ index d5ecbec..77f71fd 100644
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
-- _LT_AC_TAGVAR(archive_cmds, $1)=''
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- # When large executables or shared objects are built, AIX ld can
+- # have problems creating the table of contents. If linking a library
+- # or program results in "error TOC overflow" add -mminimal-toc to
+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11.6])dnl
++[AM_AUTOMAKE_VERSION([1.12.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+- _LT_AC_TAGVAR(archive_cmds, $1)=''
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
@@ -12668,7 +12697,11 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- fi
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++# Copyright (C) 2001-2012 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.
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -12704,11 +12737,7 @@ index d5ecbec..77f71fd 100644
- fi
- fi
- ;;
-+# 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 2
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -12717,14 +12746,9 @@ index d5ecbec..77f71fd 100644
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# serial 1
-
-- bsdi[[45]]*)
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-- ;;
+# 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/../..'.
++# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
++# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -12743,7 +12767,7 @@ index d5ecbec..77f71fd 100644
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
++# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -12760,6 +12784,16 @@ index d5ecbec..77f71fd 100644
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+- bsdi[[45]]*)
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+- ;;
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
+
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
@@ -12780,12 +12814,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
++# AM_CONDITIONAL -*- Autoconf -*-
- darwin* | rhapsody*)
- case $host_os in
@@ -12836,42 +12865,29 @@ index d5ecbec..77f71fd 100644
- esac
- fi
- ;;
-+# AM_CONDITIONAL -*- Autoconf -*-
++# Copyright (C) 1997-2012 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.
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# 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
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# serial 9
-
-- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-- # support. Future versions do this automatically, but an explicit c++rt0.o
-- # does not break anything, and helps significantly (at the cost of a little
-- # extra space).
-- freebsd2.2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++[AC_PREREQ([2.52])dnl
++ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -12890,20 +12906,31 @@ index d5ecbec..77f71fd 100644
+Usually this means the macro was only invoked conditionally.]])
+fi])])
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+- # support. Future versions do this automatically, but an explicit c++rt0.o
+- # does not break anything, and helps significantly (at the cost of a little
+- # extra space).
+- freebsd2.2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-+# 2010, 2011 Free Software Foundation, Inc.
++# Copyright (C) 1999-2012 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.
+- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
++# serial 17
+
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -12911,7 +12938,11 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# 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,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- hpux9*)
- if test "$GCC" = yes; then
@@ -12922,17 +12953,16 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
+
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- ;;
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -12945,18 +12975,6 @@ index d5ecbec..77f71fd 100644
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- ;;
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
- hpux10* | hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case $host_cpu in
@@ -12990,14 +13008,31 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
++ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
++ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
++ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
++ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
+
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- ;;
+- *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
++ # 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
@@ -13016,11 +13051,9 @@ index d5ecbec..77f71fd 100644
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
-- *)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- esac
+- fi
+- ;;
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -13035,12 +13068,16 @@ index d5ecbec..77f71fd 100644
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- ;;
-- esac
+- irix5* | irix6* | nonstopux*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
@@ -13053,40 +13090,29 @@ index d5ecbec..77f71fd 100644
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++ # Solaris 10 /bin/sh.
++ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-- irix5* | irix6* | nonstopux*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
++ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs
++ # handle '-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
- ;;
--
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
++ ;;
+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
++ # After this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
else
@@ -13105,7 +13131,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-+ # This compiler won't grok `-c -o', but also, the minuso test has
++ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
@@ -13202,7 +13228,7 @@ index d5ecbec..77f71fd 100644
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -13224,9 +13250,13 @@ index d5ecbec..77f71fd 100644
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
++[AC_ARG_ENABLE([dependency-tracking], [dnl
++AS_HELP_STRING(
++ [--enable-dependency-tracking],
++ [do not reject slow dependency extractors])
++AS_HELP_STRING(
++ [--disable-dependency-tracking],
++ [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
@@ -13286,8 +13316,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
++# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -13314,7 +13343,7 @@ index d5ecbec..77f71fd 100644
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+#serial 5
++# serial 6
- sysv4.3*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -13338,7 +13367,7 @@ index d5ecbec..77f71fd 100644
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
++ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
@@ -13350,21 +13379,19 @@ index d5ecbec..77f71fd 100644
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
++ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
@@ -13399,7 +13426,7 @@ index d5ecbec..77f71fd 100644
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
++# is enabled. FIXME. This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
@@ -13419,8 +13446,7 @@ index d5ecbec..77f71fd 100644
- ;;
+# Do all the work for Automake. -*- Autoconf -*-
+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
++# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -13437,7 +13463,7 @@ index d5ecbec..77f71fd 100644
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
- ;;
-+# serial 16
++# serial 19
- uts4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -13505,12 +13531,17 @@ index d5ecbec..77f71fd 100644
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++[AC_DIAGNOSE([obsolete],
++[$0: two- and three-arguments forms are deprecated. For more info, see:
++http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
++m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++m4_if(
++ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++ [ok:ok],,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -13560,20 +13591,25 @@ index d5ecbec..77f71fd 100644
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
++ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
++AM_MISSING_PROG([AUTOCONF], [autoconf])
++AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
++AM_MISSING_PROG([AUTOHEADER], [autoheader])
++AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++# For better backward compatibility. To be removed once Automake 1.9.x
++# dies out for good. For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
@@ -13584,21 +13620,28 @@ index d5ecbec..77f71fd 100644
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++ [_AM_DEPENDENCIES([CC])],
++ [m4_define([AC_PROG_CC],
++ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++ [_AM_DEPENDENCIES([CXX])],
++ [m4_define([AC_PROG_CXX],
++ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++ [_AM_DEPENDENCIES([OBJC])],
++ [m4_define([AC_PROG_OBJC],
++ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
++dnl Support for Objective C++ was only introduced in Autoconf 2.65,
++dnl but we still cater to Autoconf 2.62.
++m4_ifdef([AC_PROG_OBJCXX],
++[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
++ [_AM_DEPENDENCIES([OBJCXX])],
++ [m4_define([AC_PROG_OBJCXX],
++ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
++dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
++dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
@@ -13643,7 +13686,7 @@ index d5ecbec..77f71fd 100644
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
@@ -13682,8 +13725,7 @@ index d5ecbec..77f71fd 100644
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-+# Inc.
++# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -13691,7 +13733,7 @@ index d5ecbec..77f71fd 100644
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-+# serial 1
++# serial 8
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
@@ -13711,12 +13753,12 @@ index d5ecbec..77f71fd 100644
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
-+AC_SUBST(install_sh)])
++AC_SUBST([install_sh])])
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -13800,18 +13842,18 @@ index d5ecbec..77f71fd 100644
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-+# serial 4
++# serial 5
# AM_MAKE_INCLUDE()
# -----------------
-@@ -6670,7 +9366,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
+@@ -6670,7 +9421,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@@ -13820,7 +13862,7 @@ index d5ecbec..77f71fd 100644
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-@@ -6680,24 +9376,24 @@ am__quote=
+@@ -6680,24 +9431,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
@@ -13834,7 +13876,7 @@ index d5ecbec..77f71fd 100644
- am__quote=
- _am_result=GNU
-fi
-+# Ignore all kinds of additional output from `make'.
++# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
@@ -13860,24 +13902,24 @@ index d5ecbec..77f71fd 100644
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
-@@ -6707,14 +9403,14 @@ rm -f confinc confmf
+@@ -6707,14 +9458,13 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
+-# Free Software Foundation, Inc.
++# Copyright (C) 1997-2012 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 6
++# serial 7
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
-@@ -6730,7 +9426,15 @@ AC_SUBST($1)])
+@@ -6730,88 +9480,33 @@ AC_SUBST($1)])
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -13894,22 +13936,21 @@ index d5ecbec..77f71fd 100644
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
-@@ -6740,78 +9444,45 @@ else
+ else
+ am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
++ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005 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
- # ---------------
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_MKDIR_P
+-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
@@ -13930,8 +13971,7 @@ index d5ecbec..77f71fd 100644
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
+-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
@@ -13965,38 +14005,22 @@ index d5ecbec..77f71fd 100644
- fi
-fi
-AC_SUBST([mkdir_p])])
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-
+-
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-+# Foundation, Inc.
++# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-+# serial 5
++# serial 6
# _AM_MANGLE_OPTION(NAME)
# -----------------------
-@@ -6819,16 +9490,16 @@ AC_DEFUN([_AM_MANGLE_OPTION],
+@@ -6819,16 +9514,16 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
@@ -14004,7 +14028,8 @@ index d5ecbec..77f71fd 100644
+# --------------------
# 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)])
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
@@ -14016,27 +14041,29 @@ index d5ecbec..77f71fd 100644
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
-@@ -6838,14 +9509,14 @@ AC_DEFUN([_AM_IF_OPTION],
+@@ -6838,45 +9533,62 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
- # Free Software Foundation, Inc.
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996-2012 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
++# serial 9
# AM_SANITY_CHECK
# ---------------
-@@ -6854,16 +9525,29 @@ AC_DEFUN([AM_SANITY_CHECK],
- # Just in case
- sleep 1
- echo timestamp > conftest.file
+ AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
@@ -14047,41 +14074,114 @@ index d5ecbec..77f71fd 100644
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
++ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
- # Do `set' in a subshell so we don't clobber the current shell's
++# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
+- if test "$[*]" = "X"; then
+- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
-+ set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -6888,12 +9572,14 @@ Check your system clock])
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+-
++ am_has_slept=no
++ for am_try in 1 2; do
++ echo "timestamp, slept: $am_has_slept" > conftest.file
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t "$srcdir/configure" conftest.file`
++ fi
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++ alias in your environment])
++ fi
++ if test "$[2]" = conftest.file || test $am_try -eq 2; then
++ break
++ fi
++ # Just in case.
++ sleep 1
++ am_has_slept=yes
++ done
+ test "$[2]" = conftest.file
+ )
+ then
+@@ -6886,50 +9598,87 @@ else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+ Check your system clock])
fi
- AC_MSG_RESULT(yes)])
+-AC_MSG_RESULT(yes)])
++AC_MSG_RESULT([yes])
++# If we didn't sleep, we still need to ensure time stamps of config.status and
++# generated files are strictly newer.
++am_sleep_pid=
++if grep 'slept: no' conftest.file >/dev/null 2>&1; then
++ ( sleep 1 ) &
++ am_sleep_pid=$!
++fi
++AC_CONFIG_COMMANDS_PRE(
++ [AC_MSG_CHECKING([that generated files are newer than configure])
++ if test -n "$am_sleep_pid"; then
++ # Hide warnings about reused PIDs.
++ wait $am_sleep_pid 2>/dev/null
++ fi
++ AC_MSG_RESULT([done])])
++rm -f conftest.file
++])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
++# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-+# serial 1
++# serial 2
+
# AM_PROG_INSTALL_STRIP
# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
-@@ -6913,12 +9599,31 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-# One issue with vendor `install' (even GNU) is that you can't
++# One issue with vendor 'install' (even GNU) is that you can't
+ # specify the program used to strip binaries. This is especially
+ # annoying in cross-compiling environments, where the build's strip
+ # is unlikely to handle the host's binaries.
+ # Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
++# always use install-sh in "make install-strip", and initialize
+ # STRIPPROG with the value of the STRIP variable (set by the user).
+ AC_DEFUN([AM_PROG_INSTALL_STRIP],
+ [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
++# Installed binaries are usually stripped using 'strip' when the user
++# run "make install-strip". However 'strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++# will honor the 'STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
@@ -14089,7 +14189,7 @@ index d5ecbec..77f71fd 100644
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
++# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -14111,11 +14211,24 @@ index d5ecbec..77f71fd 100644
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
++# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -6940,10 +9645,11 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+ # Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
++# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+ #
+ # Substitute a variable $(am__tar) that is a command
+ # writing to stdout a FORMAT-tarball containing the directory
+@@ -6940,10 +9689,11 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
@@ -14130,10 +14243,19 @@ index d5ecbec..77f71fd 100644
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
+@@ -6951,7 +9701,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
+ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+ # Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
++# Solaris sh will not grok spaces in the rhs of '-'.
+ for _am_tool in $_am_tools
+ do
+ case $_am_tool in
diff --git a/build/ltmain.sh b/build/ltmain.sh
old mode 100755
new mode 100644
-index 5593a2e..63ae69d
+index e4476e4..63ae69d
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -1,45 +1,130 @@
@@ -14191,7 +14313,7 @@ index 5593a2e..63ae69d
-# configuration script generated by Autoconf, and is distributable
-# under the same distributions terms as OpenLDAP itself.
-
--## Portions Copyright 1998-2012 The OpenLDAP Foundation.
+-## Portions Copyright 1998-2013 The OpenLDAP Foundation.
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
@@ -29670,29 +29792,29 @@ index 5593a2e..63ae69d
+# vi:sw=2
+
diff --git a/configure b/configure
-index e4c8adc..6d19a92 100755
+index 37e4702..8386ea3 100755
--- a/configure
+++ b/configure
-@@ -1,15 +1,15 @@
+@@ -1,15 +1,13 @@
#! /bin/sh
- # From configure.in Id: 792cf0cd7da87fae39dca56961bcad11cf8b3d38 .
+-# From configure.in Id: 792cf0cd7da87fae39dca56961bcad11cf8b3d38 .
++# From configure.in Id: fcd8bd7f3dc63b300b55fdb28ef56331801be8af .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-+# Generated by GNU Autoconf 2.68.
++# Generated by GNU Autoconf 2.69.
#
- # Copyright 1998-2012 The OpenLDAP Foundation. All rights reserved.
+ # Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
# Restrictions apply, see COPYRIGHT and LICENSE files.
#
#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-+# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
-@@ -93,6 +93,7 @@ fi
+@@ -93,6 +91,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -29700,7 +29822,46 @@ index e4c8adc..6d19a92 100755
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -175,6 +176,14 @@ test x\$exitcode = x0 || exit 1"
+@@ -137,6 +136,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
++# Use a proper internal environment variable to ensure we don't fall
++ # into an infinite loop, continuously re-executing ourselves.
++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++ _as_can_reexec=no; export _as_can_reexec;
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++ fi
++ # We don't want this to propagate to other subprocesses.
++ { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+@@ -170,11 +194,20 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+ else
+ exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
@@ -29715,27 +29876,41 @@ index e4c8adc..6d19a92 100755
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -218,11 +227,18 @@ IFS=$as_save_IFS
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
-+ # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
+@@ -215,14 +248,25 @@ IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+- # We cannot yet assume a decent shell, so we have to provide a
+- # neutralization value for shells without unset; and this also
+- # works around shells that cannot unset nonexistent variables.
+- BASH_ENV=/dev/null
+- ENV=/dev/null
+- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+ case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+ esac
-+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++ export CONFIG_SHELL
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
fi
if test x$as_have_required = xno; then :
-@@ -321,7 +337,7 @@ $as_echo X"$as_dir" |
+@@ -321,10 +365,18 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -29744,7 +29919,18 @@ index e4c8adc..6d19a92 100755
} # as_fn_mkdir_p
-@@ -361,19 +377,19 @@ else
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -361,19 +413,19 @@ else
fi # as_fn_arith
@@ -29772,7 +29958,70 @@ index e4c8adc..6d19a92 100755
as_fn_exit $as_status
} # as_fn_error
-@@ -530,162 +546,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -446,6 +498,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++ # already done that, so ensure we don't try to do so again and fall
++ # in an infinite loop. This has already happened in practice.
++ _as_can_reexec=no; export _as_can_reexec
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+@@ -480,16 +536,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
++ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -501,28 +557,8 @@ else
+ as_mkdir_p=false
+ fi
+
+-if test -x / >/dev/null 2>&1; then
+- as_test_x='test -x'
+-else
+- if ls -dL / >/dev/null 2>&1; then
+- as_ls_L_option=L
+- else
+- as_ls_L_option=
+- fi
+- as_test_x='
+- eval sh -c '\''
+- if test -d "$1"; then
+- test -d "$1/.";
+- else
+- case $1 in #(
+- -*)set "./$1";;
+- esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+- ???[sx]*):;;*)false;;esac;fi
+- '\'' sh
+- '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -530,162 +566,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -29936,7 +30185,7 @@ index e4c8adc..6d19a92 100755
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -748,7 +616,9 @@ ac_includes_default="\
+@@ -748,7 +636,9 @@ ac_includes_default="\
# include <unistd.h>
#endif"
@@ -29947,7 +30196,7 @@ index e4c8adc..6d19a92 100755
SLAPD_SQL_INCLUDES
SLAPD_SQL_LIBS
SLAPD_SQL_LDFLAGS
-@@ -832,22 +702,36 @@ LIBSRCS
+@@ -832,22 +722,36 @@ LIBSRCS
LIBOBJS
MYSQL
LTSTATIC
@@ -29989,7 +30238,7 @@ index e4c8adc..6d19a92 100755
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-@@ -860,6 +744,10 @@ ac_ct_CC
+@@ -860,6 +764,10 @@ ac_ct_CC
CPPFLAGS
LDFLAGS
CFLAGS
@@ -30000,7 +30249,7 @@ index e4c8adc..6d19a92 100755
AR
CC
ldap_subdir
-@@ -874,6 +762,7 @@ am__leading_dot
+@@ -874,6 +782,7 @@ am__leading_dot
SET_MAKE
AWK
mkdir_p
@@ -30008,7 +30257,7 @@ index e4c8adc..6d19a92 100755
INSTALL_STRIP_PROGRAM
STRIP
install_sh
-@@ -885,6 +774,7 @@ ACLOCAL
+@@ -885,6 +794,7 @@ ACLOCAL
VERSION
PACKAGE
CYGPATH_W
@@ -30016,7 +30265,7 @@ index e4c8adc..6d19a92 100755
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-@@ -1011,12 +901,12 @@ enable_valsort
+@@ -1011,12 +921,12 @@ enable_valsort
enable_xxliboptions
enable_static
enable_shared
@@ -30031,7 +30280,7 @@ index e4c8adc..6d19a92 100755
with_xxinstall
'
ac_precious_vars='build_alias
-@@ -1027,7 +917,12 @@ CFLAGS
+@@ -1027,7 +937,12 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
@@ -30045,7 +30294,7 @@ index e4c8adc..6d19a92 100755
# Initialize some variables set by options.
-@@ -1090,8 +985,9 @@ do
+@@ -1090,8 +1005,9 @@ do
fi
case $ac_option in
@@ -30057,7 +30306,7 @@ index e4c8adc..6d19a92 100755
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1136,7 +1032,7 @@ do
+@@ -1136,7 +1052,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 &&
@@ -30066,7 +30315,7 @@ index e4c8adc..6d19a92 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1162,7 +1058,7 @@ do
+@@ -1162,7 +1078,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 &&
@@ -30075,7 +30324,7 @@ index e4c8adc..6d19a92 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1366,7 +1262,7 @@ do
+@@ -1366,7 +1282,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 &&
@@ -30084,7 +30333,7 @@ index e4c8adc..6d19a92 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1382,7 +1278,7 @@ do
+@@ -1382,7 +1298,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 &&
@@ -30093,7 +30342,7 @@ index e4c8adc..6d19a92 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1412,8 +1308,8 @@ do
+@@ -1412,8 +1328,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -30104,7 +30353,7 @@ index e4c8adc..6d19a92 100755
;;
*=*)
-@@ -1421,7 +1317,7 @@ Try \`$0 --help' for more information."
+@@ -1421,7 +1337,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]* )
@@ -30113,7 +30362,7 @@ index e4c8adc..6d19a92 100755
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1431,7 +1327,7 @@ Try \`$0 --help' for more information."
+@@ -1431,7 +1347,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
@@ -30122,7 +30371,7 @@ index e4c8adc..6d19a92 100755
;;
esac
-@@ -1439,13 +1335,13 @@ done
+@@ -1439,13 +1355,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -30138,7 +30387,7 @@ index e4c8adc..6d19a92 100755
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1468,7 +1364,7 @@ do
+@@ -1468,7 +1384,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -30147,18 +30396,16 @@ index e4c8adc..6d19a92 100755
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1482,8 +1378,8 @@ target=$target_alias
+@@ -1482,8 +1398,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
-+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1498,9 +1394,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1498,9 +1412,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 .` ||
@@ -30170,7 +30417,7 @@ index e4c8adc..6d19a92 100755
# Find the source files, if location was not specified.
-@@ -1539,11 +1435,11 @@ else
+@@ -1539,11 +1453,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -30184,7 +30431,7 @@ index e4c8adc..6d19a92 100755
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1583,7 +1479,7 @@ Configuration:
+@@ -1583,7 +1497,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
@@ -30193,7 +30440,20 @@ index e4c8adc..6d19a92 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
-@@ -1729,10 +1625,11 @@ Optional Packages:
+@@ -1714,8 +1628,10 @@ Library Generation & Linking Options
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+- --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors
++ --enable-dependency-tracking
++ do not reject slow dependency extractors
++ --disable-dependency-tracking
++ speeds up one-time build
+ --disable-libtool-lock avoid locking (might break parallel builds)
+
+ Optional Packages:
+@@ -1729,10 +1645,11 @@ Optional Packages:
--with-yielding-select with implicitly yielding select [auto]
--with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto]
--with-odbc with specific ODBC support iodbc|unixodbc|odbc32|auto [auto]
@@ -30208,7 +30468,7 @@ index e4c8adc..6d19a92 100755
See INSTALL file for further details.
-@@ -1745,6 +1642,14 @@ Some influential environment variables:
+@@ -1745,6 +1662,14 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -30223,19 +30483,19 @@ index e4c8adc..6d19a92 100755
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -1813,9 +1718,9 @@ test -n "$ac_init_help" && exit $ac_status
+@@ -1813,9 +1738,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.65
-+generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
-Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-@@ -1862,7 +1767,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1862,7 +1787,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -30244,7 +30504,16 @@ index e4c8adc..6d19a92 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-@@ -1908,11 +1813,42 @@ fi
+@@ -1894,7 +1819,7 @@ $as_echo "$ac_try_echo"; } >&5
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
++ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+ else
+@@ -1908,11 +1833,42 @@ 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
@@ -30288,7 +30557,7 @@ index e4c8adc..6d19a92 100755
# ac_fn_c_try_cpp LINENO
# ----------------------
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-@@ -1934,7 +1870,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1934,7 +1890,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -30297,7 +30566,7 @@ index e4c8adc..6d19a92 100755
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1945,104 +1881,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1945,104 +1901,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -30403,7 +30672,7 @@ index e4c8adc..6d19a92 100755
# ac_fn_c_try_run LINENO
# ----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-@@ -2080,42 +1923,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2080,42 +1943,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -30447,7 +30716,7 @@ index e4c8adc..6d19a92 100755
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
-@@ -2124,7 +1936,7 @@ ac_fn_c_check_func ()
+@@ -2124,7 +1956,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; }
@@ -30456,7 +30725,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2179,47 +1991,138 @@ fi
+@@ -2179,37 +2011,128 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -30509,16 +30778,6 @@ index e4c8adc..6d19a92 100755
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--$4
--int
--main ()
--{
--if (sizeof (($2)))
-- return 0;
-- ;
-- return 0;
--}
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
@@ -30610,20 +30869,10 @@ index e4c8adc..6d19a92 100755
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+if (sizeof (($2)))
-+ return 0;
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-
-@@ -2233,7 +2136,7 @@ fi
+ /* end confdefs.h. */
+ $4
+ int
+@@ -2233,7 +2156,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -30632,7 +30881,7 @@ index e4c8adc..6d19a92 100755
} # ac_fn_c_check_type
-@@ -2246,7 +2149,7 @@ ac_fn_c_check_member ()
+@@ -2246,7 +2169,7 @@ ac_fn_c_check_member ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
$as_echo_n "checking for $2.$3... " >&6; }
@@ -30641,7 +30890,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2290,7 +2193,7 @@ fi
+@@ -2290,7 +2213,7 @@ fi
eval ac_res=\$$4
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -30650,7 +30899,57 @@ index e4c8adc..6d19a92 100755
} # ac_fn_c_check_member
-@@ -2467,7 +2370,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+@@ -2311,7 +2234,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= 0)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+
+ ;
+ return 0;
+@@ -2327,7 +2251,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+
+ ;
+ return 0;
+@@ -2353,7 +2278,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) < 0)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+
+ ;
+ return 0;
+@@ -2369,7 +2295,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+
+ ;
+ return 0;
+@@ -2403,7 +2330,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+
+ ;
+ return 0;
+@@ -2467,7 +2395,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
rm -f conftest.val
fi
@@ -30659,16 +30958,16 @@ index e4c8adc..6d19a92 100755
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
-@@ -2476,7 +2379,7 @@ This file contains any messages produced by compilers while
+@@ -2476,7 +2404,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.65. Invocation command line was
-+generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
-@@ -2586,11 +2489,9 @@ trap 'exit_status=$?
+@@ -2586,11 +2514,9 @@ trap 'exit_status=$?
{
echo
@@ -30682,7 +30981,7 @@ index e4c8adc..6d19a92 100755
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2624,11 +2525,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -2624,11 +2550,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
@@ -30696,7 +30995,7 @@ index e4c8adc..6d19a92 100755
echo
for ac_var in $ac_subst_vars
do
-@@ -2641,11 +2540,9 @@ _ASBOX
+@@ -2641,11 +2565,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
@@ -30710,7 +31009,7 @@ index e4c8adc..6d19a92 100755
echo
for ac_var in $ac_subst_files
do
-@@ -2659,11 +2556,9 @@ _ASBOX
+@@ -2659,11 +2581,9 @@ _ASBOX
fi
if test -s confdefs.h; then
@@ -30724,7 +31023,7 @@ index e4c8adc..6d19a92 100755
echo
cat confdefs.h
echo
-@@ -2718,7 +2613,12 @@ _ACEOF
+@@ -2718,7 +2638,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -30738,7 +31037,7 @@ index e4c8adc..6d19a92 100755
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2733,7 +2633,11 @@ do
+@@ -2733,7 +2658,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
@@ -30751,7 +31050,7 @@ index e4c8adc..6d19a92 100755
fi
done
-@@ -2793,7 +2697,7 @@ if $ac_cache_corrupted; then
+@@ -2793,7 +2722,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;}
@@ -30760,7 +31059,7 @@ index e4c8adc..6d19a92 100755
fi
## -------------------- ##
## Main body of script. ##
-@@ -2834,16 +2738,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2834,16 +2763,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in build "$srcdir"/build; do
@@ -30791,7 +31090,7 @@ index e4c8adc..6d19a92 100755
fi
# These three variables are undocumented and unsupported,
-@@ -2857,13 +2767,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+@@ -2857,13 +2792,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
eval `$ac_aux_dir/version.sh`
if test -z "$OL_STRING"; then
@@ -30807,7 +31106,7 @@ index e4c8adc..6d19a92 100755
fi
SHTOOL="$ac_cv_shtool"
-@@ -2885,27 +2795,27 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_REPO}..."
+@@ -2885,27 +2820,27 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_REPO}..."
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -30840,7 +31139,7 @@ index e4c8adc..6d19a92 100755
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -2923,14 +2833,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+@@ -2923,14 +2858,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; }
@@ -30857,7 +31156,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -2938,7 +2848,7 @@ fi
+@@ -2938,7 +2873,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -30866,7 +31165,7 @@ index e4c8adc..6d19a92 100755
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -2956,14 +2866,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+@@ -2956,14 +2891,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
@@ -30883,7 +31182,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -2971,7 +2881,7 @@ fi
+@@ -2971,7 +2906,7 @@ fi
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
@@ -30892,17 +31191,17 @@ index e4c8adc..6d19a92 100755
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
-@@ -2994,7 +2904,8 @@ test -n "$target_alias" &&
+@@ -2994,7 +2929,8 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version="1.9"
-+am__api_version='1.11'
++am__api_version='1.12'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -3012,7 +2923,7 @@ am__api_version="1.9"
+@@ -3012,7 +2948,7 @@ am__api_version="1.9"
{ $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
@@ -30911,10 +31210,23 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3093,16 +3004,29 @@ $as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
+@@ -3032,7 +2968,7 @@ case $as_dir/ in #((
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -3090,43 +3026,71 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
@@ -30925,34 +31237,60 @@ index e4c8adc..6d19a92 100755
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
- # Do `set' in a subshell so we don't clobber the current shell's
++# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
+- if test "$*" = "X"; then
+- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
-+ set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -3112,7 +3036,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".
+- fi
+- rm -f conftest.file
+- if test "$*" != "X $srcdir/configure conftest.file" \
+- && test "$*" != "X conftest.file $srcdir/configure"; then
+-
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
-+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
-@@ -3122,7 +3046,7 @@ then
+-alias in your environment" "$LINENO" 5
+- fi
+-
++ am_has_slept=no
++ for am_try in 1 2; do
++ echo "timestamp, slept: $am_has_slept" > conftest.file
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++ if test "$*" = "X"; then
++ # -L didn't work.
++ set X `ls -t "$srcdir/configure" conftest.file`
++ fi
++ if test "$*" != "X $srcdir/configure conftest.file" \
++ && test "$*" != "X conftest.file $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
++ alias in your environment" "$LINENO" 5
++ fi
++ if test "$2" = conftest.file || test $am_try -eq 2; then
++ break
++ fi
++ # Just in case.
++ sleep 1
++ am_has_slept=yes
++ done
+ test "$2" = conftest.file
+ )
+ then
# Ok.
:
else
@@ -30961,7 +31299,21 @@ index e4c8adc..6d19a92 100755
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -3140,7 +3064,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+ $as_echo "yes" >&6; }
++# If we didn't sleep, we still need to ensure time stamps of config.status and
++# generated files are strictly newer.
++am_sleep_pid=
++if grep 'slept: no' conftest.file >/dev/null 2>&1; then
++ ( sleep 1 ) &
++ am_sleep_pid=$!
++fi
++
++rm -f conftest.file
++
+ test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -3140,48 +3104,173 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -30977,10 +31329,12 @@ index e4c8adc..6d19a92 100755
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
-@@ -3150,38 +3081,162 @@ else
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
+ else
+ am_missing_run=
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+-fi
+-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
@@ -31005,6 +31359,10 @@ index e4c8adc..6d19a92 100755
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
++fi
++
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
@@ -31014,10 +31372,10 @@ index e4c8adc..6d19a92 100755
+ esac
+fi
+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
++# Installed binaries are usually stripped using 'strip' when the user
++# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
++# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -31036,7 +31394,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -31076,7 +31434,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -31127,7 +31485,7 @@ index e4c8adc..6d19a92 100755
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
@@ -31159,16 +31517,10 @@ index e4c8adc..6d19a92 100755
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+ [\\/$]* | ?:[\\/]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
for ac_prog in gawk mawk nawk awk
do
-@@ -3189,7 +3244,7 @@ do
+@@ -3189,7 +3278,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; }
@@ -31177,7 +31529,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -3229,7 +3284,7 @@ done
+@@ -3201,7 +3290,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -3229,7 +3318,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'`
@@ -31186,7 +31547,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -3237,7 +3292,7 @@ SHELL = /bin/sh
+@@ -3237,7 +3326,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -31195,7 +31556,7 @@ index e4c8adc..6d19a92 100755
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -3265,10 +3320,14 @@ else
+@@ -3265,10 +3354,14 @@ else
fi
rmdir .tst 2>/dev/null
@@ -31214,17 +31575,20 @@ index e4c8adc..6d19a92 100755
fi
# test whether we have cygpath
-@@ -3302,115 +3361,13 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+@@ -3282,6 +3375,7 @@ fi
+
+
+ # Define the identity of the package.
++
+ PACKAGE=$OL_PACKAGE
+ VERSION=$OL_VERSION
+
+@@ -3302,115 +3396,19 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility. Yes, it's still used
-+# in the wild :-( We should find a proper way to deprecate it ...
-+AMTAR='$${TAR-tar}'
-
+-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
@@ -31324,19 +31688,27 @@ index e4c8adc..6d19a92 100755
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
++# For better backward compatibility. To be removed once Automake 1.9.x
++# dies out for good. For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++mkdir_p='$(MKDIR_P)'
+
+ # We need awk for the "check" target. 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 -'
-@@ -3503,7 +3460,7 @@ if test "${enable_debug+set}" = set; then :
+@@ -3503,7 +3501,7 @@ if test "${enable_debug+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31345,7 +31717,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_debug="$ol_arg"
-@@ -3524,7 +3481,7 @@ if test "${enable_dynamic+set}" = set; then :
+@@ -3524,7 +3522,7 @@ if test "${enable_dynamic+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31354,7 +31726,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dynamic="$ol_arg"
-@@ -3545,7 +3502,7 @@ if test "${enable_syslog+set}" = set; then :
+@@ -3545,7 +3543,7 @@ if test "${enable_syslog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31363,7 +31735,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_syslog="$ol_arg"
-@@ -3566,7 +3523,7 @@ if test "${enable_proctitle+set}" = set; then :
+@@ -3566,7 +3564,7 @@ if test "${enable_proctitle+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31372,7 +31744,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_proctitle="$ol_arg"
-@@ -3588,7 +3545,7 @@ if test "${enable_ipv6+set}" = set; then :
+@@ -3588,7 +3586,7 @@ if test "${enable_ipv6+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31381,7 +31753,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_ipv6="$ol_arg"
-@@ -3609,7 +3566,7 @@ if test "${enable_local+set}" = set; then :
+@@ -3609,7 +3607,7 @@ if test "${enable_local+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31390,7 +31762,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_local="$ol_arg"
-@@ -3631,7 +3588,7 @@ if test "${with_cyrus_sasl+set}" = set; then :
+@@ -3631,7 +3629,7 @@ if test "${with_cyrus_sasl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31399,7 +31771,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_cyrus_sasl="$ol_arg"
-@@ -3652,7 +3609,7 @@ if test "${with_fetch+set}" = set; then :
+@@ -3652,7 +3650,7 @@ if test "${with_fetch+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31408,7 +31780,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_fetch="$ol_arg"
-@@ -3673,7 +3630,7 @@ if test "${with_threads+set}" = set; then :
+@@ -3673,7 +3671,7 @@ if test "${with_threads+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31417,7 +31789,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_threads="$ol_arg"
-@@ -3694,7 +3651,7 @@ if test "${with_tls+set}" = set; then :
+@@ -3694,7 +3692,7 @@ if test "${with_tls+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31426,7 +31798,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_tls="$ol_arg"
-@@ -3715,7 +3672,7 @@ if test "${with_yielding_select+set}" = set; then :
+@@ -3715,7 +3713,7 @@ if test "${with_yielding_select+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31435,7 +31807,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_yielding_select="$ol_arg"
-@@ -3736,7 +3693,7 @@ if test "${with_mp+set}" = set; then :
+@@ -3736,7 +3734,7 @@ if test "${with_mp+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31444,7 +31816,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_mp="$ol_arg"
-@@ -3757,7 +3714,7 @@ if test "${with_odbc+set}" = set; then :
+@@ -3757,7 +3755,7 @@ if test "${with_odbc+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31453,7 +31825,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_odbc="$ol_arg"
-@@ -3785,7 +3742,7 @@ if test "${enable_slapd+set}" = set; then :
+@@ -3785,7 +3783,7 @@ if test "${enable_slapd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31462,7 +31834,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_slapd="$ol_arg"
-@@ -3806,7 +3763,7 @@ if test "${enable_dynacl+set}" = set; then :
+@@ -3806,7 +3804,7 @@ if test "${enable_dynacl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31471,7 +31843,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dynacl="$ol_arg"
-@@ -3827,7 +3784,7 @@ if test "${enable_aci+set}" = set; then :
+@@ -3827,7 +3825,7 @@ if test "${enable_aci+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31480,7 +31852,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_aci="$ol_arg"
-@@ -3848,7 +3805,7 @@ if test "${enable_cleartext+set}" = set; then :
+@@ -3848,7 +3846,7 @@ if test "${enable_cleartext+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31489,7 +31861,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_cleartext="$ol_arg"
-@@ -3869,7 +3826,7 @@ if test "${enable_crypt+set}" = set; then :
+@@ -3869,7 +3867,7 @@ if test "${enable_crypt+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31498,7 +31870,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_crypt="$ol_arg"
-@@ -3890,7 +3847,7 @@ if test "${enable_lmpasswd+set}" = set; then :
+@@ -3890,7 +3888,7 @@ if test "${enable_lmpasswd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31507,7 +31879,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_lmpasswd="$ol_arg"
-@@ -3911,7 +3868,7 @@ if test "${enable_spasswd+set}" = set; then :
+@@ -3911,7 +3909,7 @@ if test "${enable_spasswd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31516,7 +31888,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_spasswd="$ol_arg"
-@@ -3932,7 +3889,7 @@ if test "${enable_modules+set}" = set; then :
+@@ -3932,7 +3930,7 @@ if test "${enable_modules+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31525,7 +31897,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_modules="$ol_arg"
-@@ -3953,7 +3910,7 @@ if test "${enable_rewrite+set}" = set; then :
+@@ -3953,7 +3951,7 @@ if test "${enable_rewrite+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31534,7 +31906,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_rewrite="$ol_arg"
-@@ -3974,7 +3931,7 @@ if test "${enable_rlookups+set}" = set; then :
+@@ -3974,7 +3972,7 @@ if test "${enable_rlookups+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31543,7 +31915,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_rlookups="$ol_arg"
-@@ -3995,7 +3952,7 @@ if test "${enable_slapi+set}" = set; then :
+@@ -3995,7 +3993,7 @@ if test "${enable_slapi+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31552,7 +31924,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_slapi="$ol_arg"
-@@ -4016,7 +3973,7 @@ if test "${enable_slp+set}" = set; then :
+@@ -4016,7 +4014,7 @@ if test "${enable_slp+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31561,7 +31933,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_slp="$ol_arg"
-@@ -4037,7 +3994,7 @@ if test "${enable_wrappers+set}" = set; then :
+@@ -4037,7 +4035,7 @@ if test "${enable_wrappers+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31570,7 +31942,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_wrappers="$ol_arg"
-@@ -4081,7 +4038,7 @@ if test "${enable_backends+set}" = set; then :
+@@ -4081,7 +4079,7 @@ if test "${enable_backends+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31579,7 +31951,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_backends="$ol_arg"
-@@ -4100,7 +4057,7 @@ if test "${enable_bdb+set}" = set; then :
+@@ -4100,7 +4098,7 @@ if test "${enable_bdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31588,7 +31960,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_bdb="$ol_arg"
-@@ -4121,7 +4078,7 @@ if test "${enable_dnssrv+set}" = set; then :
+@@ -4121,7 +4119,7 @@ if test "${enable_dnssrv+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31597,7 +31969,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dnssrv="$ol_arg"
-@@ -4142,7 +4099,7 @@ if test "${enable_hdb+set}" = set; then :
+@@ -4142,7 +4140,7 @@ if test "${enable_hdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31606,7 +31978,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_hdb="$ol_arg"
-@@ -4163,7 +4120,7 @@ if test "${enable_ldap+set}" = set; then :
+@@ -4163,7 +4161,7 @@ if test "${enable_ldap+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31615,7 +31987,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_ldap="$ol_arg"
-@@ -4184,7 +4141,7 @@ if test "${enable_mdb+set}" = set; then :
+@@ -4184,7 +4182,7 @@ if test "${enable_mdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31624,7 +31996,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_mdb="$ol_arg"
-@@ -4205,7 +4162,7 @@ if test "${enable_meta+set}" = set; then :
+@@ -4205,7 +4203,7 @@ if test "${enable_meta+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31633,7 +32005,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_meta="$ol_arg"
-@@ -4226,7 +4183,7 @@ if test "${enable_monitor+set}" = set; then :
+@@ -4226,7 +4224,7 @@ if test "${enable_monitor+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31642,7 +32014,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_monitor="$ol_arg"
-@@ -4247,7 +4204,7 @@ if test "${enable_ndb+set}" = set; then :
+@@ -4247,7 +4245,7 @@ if test "${enable_ndb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31651,7 +32023,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_ndb="$ol_arg"
-@@ -4268,7 +4225,7 @@ if test "${enable_null+set}" = set; then :
+@@ -4268,7 +4266,7 @@ if test "${enable_null+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31660,7 +32032,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_null="$ol_arg"
-@@ -4289,7 +4246,7 @@ if test "${enable_passwd+set}" = set; then :
+@@ -4289,7 +4287,7 @@ if test "${enable_passwd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31669,7 +32041,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_passwd="$ol_arg"
-@@ -4310,7 +4267,7 @@ if test "${enable_perl+set}" = set; then :
+@@ -4310,7 +4308,7 @@ if test "${enable_perl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31678,7 +32050,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_perl="$ol_arg"
-@@ -4331,7 +4288,7 @@ if test "${enable_relay+set}" = set; then :
+@@ -4331,7 +4329,7 @@ if test "${enable_relay+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31687,7 +32059,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_relay="$ol_arg"
-@@ -4352,7 +4309,7 @@ if test "${enable_shell+set}" = set; then :
+@@ -4352,7 +4350,7 @@ if test "${enable_shell+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31696,7 +32068,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_shell="$ol_arg"
-@@ -4373,7 +4330,7 @@ if test "${enable_sock+set}" = set; then :
+@@ -4373,7 +4371,7 @@ if test "${enable_sock+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31705,7 +32077,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_sock="$ol_arg"
-@@ -4394,7 +4351,7 @@ if test "${enable_sql+set}" = set; then :
+@@ -4394,7 +4392,7 @@ if test "${enable_sql+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31714,7 +32086,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_sql="$ol_arg"
-@@ -4443,7 +4400,7 @@ if test "${enable_overlays+set}" = set; then :
+@@ -4443,7 +4441,7 @@ if test "${enable_overlays+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31723,7 +32095,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_overlays="$ol_arg"
-@@ -4462,7 +4419,7 @@ if test "${enable_accesslog+set}" = set; then :
+@@ -4462,7 +4460,7 @@ if test "${enable_accesslog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31732,7 +32104,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_accesslog="$ol_arg"
-@@ -4484,7 +4441,7 @@ if test "${enable_auditlog+set}" = set; then :
+@@ -4484,7 +4482,7 @@ if test "${enable_auditlog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31741,7 +32113,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_auditlog="$ol_arg"
-@@ -4506,7 +4463,7 @@ if test "${enable_collect+set}" = set; then :
+@@ -4506,7 +4504,7 @@ if test "${enable_collect+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31750,7 +32122,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_collect="$ol_arg"
-@@ -4528,7 +4485,7 @@ if test "${enable_constraint+set}" = set; then :
+@@ -4528,7 +4526,7 @@ if test "${enable_constraint+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31759,7 +32131,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_constraint="$ol_arg"
-@@ -4550,7 +4507,7 @@ if test "${enable_dds+set}" = set; then :
+@@ -4550,7 +4548,7 @@ if test "${enable_dds+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31768,7 +32140,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dds="$ol_arg"
-@@ -4572,7 +4529,7 @@ if test "${enable_deref+set}" = set; then :
+@@ -4572,7 +4570,7 @@ if test "${enable_deref+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31777,7 +32149,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_deref="$ol_arg"
-@@ -4594,7 +4551,7 @@ if test "${enable_dyngroup+set}" = set; then :
+@@ -4594,7 +4592,7 @@ if test "${enable_dyngroup+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31786,7 +32158,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dyngroup="$ol_arg"
-@@ -4616,7 +4573,7 @@ if test "${enable_dynlist+set}" = set; then :
+@@ -4616,7 +4614,7 @@ if test "${enable_dynlist+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31795,7 +32167,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_dynlist="$ol_arg"
-@@ -4638,7 +4595,7 @@ if test "${enable_memberof+set}" = set; then :
+@@ -4638,7 +4636,7 @@ if test "${enable_memberof+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31804,7 +32176,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_memberof="$ol_arg"
-@@ -4660,7 +4617,7 @@ if test "${enable_ppolicy+set}" = set; then :
+@@ -4660,7 +4658,7 @@ if test "${enable_ppolicy+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31813,7 +32185,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_ppolicy="$ol_arg"
-@@ -4682,7 +4639,7 @@ if test "${enable_proxycache+set}" = set; then :
+@@ -4682,7 +4680,7 @@ if test "${enable_proxycache+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31822,7 +32194,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_proxycache="$ol_arg"
-@@ -4704,7 +4661,7 @@ if test "${enable_refint+set}" = set; then :
+@@ -4704,7 +4702,7 @@ if test "${enable_refint+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31831,7 +32203,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_refint="$ol_arg"
-@@ -4726,7 +4683,7 @@ if test "${enable_retcode+set}" = set; then :
+@@ -4726,7 +4724,7 @@ if test "${enable_retcode+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31840,7 +32212,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_retcode="$ol_arg"
-@@ -4748,7 +4705,7 @@ if test "${enable_rwm+set}" = set; then :
+@@ -4748,7 +4746,7 @@ if test "${enable_rwm+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31849,7 +32221,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_rwm="$ol_arg"
-@@ -4770,7 +4727,7 @@ if test "${enable_seqmod+set}" = set; then :
+@@ -4770,7 +4768,7 @@ if test "${enable_seqmod+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31858,7 +32230,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_seqmod="$ol_arg"
-@@ -4792,7 +4749,7 @@ if test "${enable_sssvlv+set}" = set; then :
+@@ -4792,7 +4790,7 @@ if test "${enable_sssvlv+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31867,7 +32239,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_sssvlv="$ol_arg"
-@@ -4814,7 +4771,7 @@ if test "${enable_syncprov+set}" = set; then :
+@@ -4814,7 +4812,7 @@ if test "${enable_syncprov+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31876,7 +32248,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_syncprov="$ol_arg"
-@@ -4836,7 +4793,7 @@ if test "${enable_translucent+set}" = set; then :
+@@ -4836,7 +4834,7 @@ if test "${enable_translucent+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31885,7 +32257,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_translucent="$ol_arg"
-@@ -4858,7 +4815,7 @@ if test "${enable_unique+set}" = set; then :
+@@ -4858,7 +4856,7 @@ if test "${enable_unique+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31894,7 +32266,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_unique="$ol_arg"
-@@ -4880,7 +4837,7 @@ if test "${enable_valsort+set}" = set; then :
+@@ -4880,7 +4878,7 @@ if test "${enable_valsort+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
@@ -31903,7 +32275,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_valsort="$ol_arg"
-@@ -4920,6 +4877,13 @@ else
+@@ -4920,6 +4918,13 @@ else
fi
@@ -31917,7 +32289,7 @@ index e4c8adc..6d19a92 100755
# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
-@@ -4946,6 +4910,13 @@ fi
+@@ -4946,6 +4951,13 @@ fi
@@ -31931,7 +32303,7 @@ index e4c8adc..6d19a92 100755
# validate options
if test $ol_enable_slapd = no ; then
if test $ol_enable_slapi = yes ; then
-@@ -5032,7 +5003,7 @@ elif test $ol_enable_modules != yes &&
+@@ -5032,7 +5044,7 @@ elif test $ol_enable_modules != yes &&
test $ol_enable_sql = no ; then
if test $ol_enable_slapd = yes ; then
@@ -31940,7 +32312,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping slapd, no backend specified" >&5
$as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
-@@ -5041,18 +5012,18 @@ $as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
+@@ -5041,18 +5053,18 @@ $as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
fi
if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then
@@ -31962,7 +32334,7 @@ index e4c8adc..6d19a92 100755
fi
ol_with_cyrus_sasl=yes
fi
-@@ -5169,7 +5140,7 @@ do
+@@ -5169,7 +5181,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; }
@@ -31971,7 +32343,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5208,7 +5179,7 @@ done
+@@ -5181,7 +5193,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -5208,7 +5220,7 @@ done
if test "$CC" = cc ; then
if test $ol_with_threads != auto ; then
@@ -31980,7 +32361,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling threads, no cc_r on AIX" >&5
$as_echo "$as_me: WARNING: disabling threads, no cc_r on AIX" >&2;}
-@@ -5231,7 +5202,7 @@ do
+@@ -5231,7 +5243,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; }
@@ -31989,7 +32370,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5270,7 +5241,7 @@ test -n "$CC" || CC="missing"
+@@ -5243,7 +5255,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -5270,7 +5282,7 @@ test -n "$CC" || CC="missing"
if test "${CC}" = "missing" ; then
@@ -31998,7 +32388,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -5281,7 +5252,7 @@ do
+@@ -5281,7 +5293,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; }
@@ -32007,7 +32397,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5320,118 +5291,24 @@ test -n "$AR" || AR="missing"
+@@ -5293,7 +5305,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -5320,118 +5332,24 @@ test -n "$AR" || AR="missing"
if test "${AR}" = "missing" ; then
@@ -32136,16 +32535,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5440,7 +5317,7 @@ do
+@@ -5439,8 +5357,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5450,10 +5327,10 @@ IFS=$as_save_IFS
+@@ -5450,10 +5368,10 @@ IFS=$as_save_IFS
fi
fi
@@ -32160,7 +32561,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -5461,17 +5338,17 @@ fi
+@@ -5461,17 +5379,17 @@ fi
fi
@@ -32185,16 +32586,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5480,7 +5357,7 @@ do
+@@ -5479,8 +5397,8 @@ 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
+- 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_CC="gcc"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AS="as"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5490,17 +5367,17 @@ IFS=$as_save_IFS
+@@ -5490,17 +5408,17 @@ IFS=$as_save_IFS
fi
fi
@@ -32218,7 +32621,7 @@ index e4c8adc..6d19a92 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -5508,23 +5385,22 @@ yes:)
+@@ -5508,23 +5426,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -32250,16 +32653,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5533,7 +5409,7 @@ do
+@@ -5532,8 +5449,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5543,30 +5419,29 @@ IFS=$as_save_IFS
+@@ -5543,42 +5460,37 @@ IFS=$as_save_IFS
fi
fi
@@ -32301,20 +32706,21 @@ index e4c8adc..6d19a92 100755
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
-@@ -5574,11 +5449,7 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5586,44 +5457,42 @@ done
+@@ -5586,44 +5498,42 @@ done
done
IFS=$as_save_IFS
@@ -32329,9 +32735,9 @@ index e4c8adc..6d19a92 100755
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
+-fi
fi
fi
--fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -32382,16 +32788,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5632,7 +5501,7 @@ do
+@@ -5631,8 +5541,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5642,32 +5511,28 @@ IFS=$as_save_IFS
+@@ -5642,32 +5552,28 @@ IFS=$as_save_IFS
fi
fi
@@ -32435,16 +32843,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5676,7 +5541,7 @@ do
+@@ -5675,8 +5581,8 @@ 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
+- 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_CC="$ac_prog"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5686,21 +5551,17 @@ IFS=$as_save_IFS
+@@ -5686,21 +5592,17 @@ IFS=$as_save_IFS
fi
fi
@@ -32472,7 +32882,7 @@ index e4c8adc..6d19a92 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -5708,1077 +5569,2262 @@ yes:)
+@@ -5708,800 +5610,1409 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -32629,21 +33039,7 @@ index e4c8adc..6d19a92 100755
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+
-+
-+
-+
-+
-+
-+enable_dlopen=yes
-+
-+
-+
-+case `pwd` in
-+ *\ * | *\ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
@@ -32668,65 +33064,7 @@ index e4c8adc..6d19a92 100755
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-+
-+
-+
-+macro_version='2.4.2'
-+macro_revision='1.3337'
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ltmain="$ac_aux_dir/ltmain.sh"
-+
-+# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-+$as_echo_n "checking how to print strings... " >&6; }
-+# Test print first, because it will be a builtin if present.
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='printf %s\n'
-+else
-+ # Use this function as a fallback that always works.
-+ func_fallback_echo ()
-+ {
-+ eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+ }
-+ ECHO='func_fallback_echo'
- fi
+-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
@@ -32739,17 +33077,13 @@ index e4c8adc..6d19a92 100755
-#include <stdio.h>
-int
-main ()
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
- {
+-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
--
+
- ;
- return 0;
-+ $ECHO ""
- }
+-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
@@ -32772,15 +33106,7 @@ index e4c8adc..6d19a92 100755
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+
-+case "$ECHO" in
-+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-+$as_echo "printf" >&6; } ;;
-+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-+$as_echo "print -r" >&6; } ;;
-+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-+$as_echo "cat" >&6; } ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
@@ -32826,7 +33152,16 @@ index e4c8adc..6d19a92 100755
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++
++enable_dlopen=yes
++
++
++
++case `pwd` in
++ *\ * | *\ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
@@ -32882,8 +33217,62 @@ index e4c8adc..6d19a92 100755
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
++macro_version='2.4.2'
++macro_revision='1.3337'
--fi
++
++
++
++
++
++
++
++
++
++
++
++
++ltmain="$ac_aux_dir/ltmain.sh"
++
++# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
++$as_echo_n "checking how to print strings... " >&6; }
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='printf %s\n'
++else
++ # Use this function as a fallback that always works.
++ func_fallback_echo ()
++ {
++ eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++ }
++ ECHO='func_fallback_echo'
+ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
@@ -32907,11 +33296,15 @@ index e4c8adc..6d19a92 100755
-int
-main ()
--{
-
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
+ {
+-
- ;
- return 0;
--}
++ $ECHO ""
+ }
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
@@ -32923,6 +33316,14 @@ index e4c8adc..6d19a92 100755
-int
-main ()
-{
++case "$ECHO" in
++ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
++$as_echo "printf" >&6; } ;;
++ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
++$as_echo "print -r" >&6; } ;;
++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
++$as_echo "cat" >&6; } ;;
++esac
- ;
- return 0;
@@ -32946,8 +33347,16 @@ index e4c8adc..6d19a92 100755
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
++
++
++
++
++
++
++
++
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
@@ -32967,7 +33376,7 @@ index e4c8adc..6d19a92 100755
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
++# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
@@ -32987,7 +33396,23 @@ index e4c8adc..6d19a92 100755
+ esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
++$as_echo "$_am_result" >&6; }
++rm -f confinc confmf
++
++# Check whether --enable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then :
++ enableval=$enable_dependency_tracking;
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test "x$enable_dependency_tracking" != xno; then
++ am_depcomp="$ac_aux_dir/depcomp"
++ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
@@ -33012,7 +33437,10 @@ index e4c8adc..6d19a92 100755
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
- $as_echo_n "(cached) " >&6
--else
++ if test "x$enable_dependency_tracking" != xno; then
++ AMDEP_TRUE=
++ AMDEP_FALSE='#'
+ else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33039,7 +33467,7 @@ index e4c8adc..6d19a92 100755
- va_end (v);
- return s;
-}
-
+-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
@@ -33048,15 +33476,12 @@ index e4c8adc..6d19a92 100755
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
+-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
-+rm -f confinc confmf
-
+-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
@@ -33077,20 +33502,15 @@ index e4c8adc..6d19a92 100755
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-+# Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then :
-+ enableval=$enable_dependency_tracking;
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+ am__nodep='_no'
+-
++ AMDEP_TRUE='#'
++ AMDEP_FALSE=
fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
@@ -33106,16 +33526,9 @@ index e4c8adc..6d19a92 100755
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
--
-+ if test "x$enable_dependency_tracking" != xno; then
-+ AMDEP_TRUE=
-+ AMDEP_FALSE='#'
-+else
-+ AMDEP_TRUE='#'
-+ AMDEP_FALSE=
- fi
-+
+-fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -33166,7 +33579,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -33302,7 +33715,11 @@ index e4c8adc..6d19a92 100755
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
-- fi
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CC="gcc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
@@ -33318,29 +33735,35 @@ index e4c8adc..6d19a92 100755
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-+ 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_CC="gcc"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
done
+ done
+IFS=$as_save_IFS
fi
+-
+-SED=$lt_cv_path_SED
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+-$as_echo "$SED" >&6; }
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
-+else
+ else
+- if test -z "$GREP"; then
+- ac_path_GREP_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
-
--SED=$lt_cv_path_SED
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
--$as_echo "$SED" >&6; }
++
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -33355,10 +33778,7 @@ index e4c8adc..6d19a92 100755
+else
+ CC="$ac_cv_prog_CC"
+fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then :
++
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
@@ -33366,13 +33786,8 @@ index e4c8adc..6d19a92 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test -z "$GREP"; then
-- ac_path_GREP_found=false
-- # Loop through the user's path and test for each of PROGNAME-LIST
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++ $as_echo_n "(cached) " >&6
++else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
@@ -33409,15 +33824,58 @@ index e4c8adc..6d19a92 100755
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
-- done
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
+ done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
--
++IFS=$as_save_IFS
+
- $ac_path_GREP_found && break 3
- done
- done
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ fi
++fi
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -33426,11 +33884,22 @@ index e4c8adc..6d19a92 100755
IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-- fi
++
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
-else
- ac_cv_path_GREP=$GREP
--fi
-
+ fi
+-
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
@@ -33449,11 +33918,13 @@ index e4c8adc..6d19a92 100755
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-+ fi
+fi
+if test -z "$CC"; then
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
@@ -33470,7 +33941,6 @@ index e4c8adc..6d19a92 100755
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
-+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
@@ -33504,223 +33974,34 @@ index e4c8adc..6d19a92 100755
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
-- done
-- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
-- $ac_path_EGREP_found && break 3
-- done
-- done
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
done
- IFS=$as_save_IFS
-- if test -z "$ac_cv_path_EGREP"; then
-- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# != 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
--else
-- ac_cv_path_EGREP=$EGREP
- fi
--
-- fi
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
--
--
--
--# Check whether --with-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then :
-- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
++IFS=$as_save_IFS
+
+- $ac_path_EGREP_found && break 3
+- done
++fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
- else
-- with_gnu_ld=no
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- fi
-
--ac_prog=ld
--if test "$GCC" = yes; then
-- # Check if gcc -print-prog-name=ld gives a path.
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
--$as_echo_n "checking for ld used by $CC... " >&6; }
-- case $host in
-- *-*-mingw*)
-- # gcc leaves a trailing carriage return which upsets mingw
-- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-- *)
-- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-- esac
-- case $ac_prog in
-- # Accept absolute paths.
-- [\\/]* | ?:[\\/]*)
-- re_direlt='/[^/][^/]*/\.\./'
-- # Canonicalize the pathname of ld
-- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-- done
-- test -z "$LD" && LD="$ac_prog"
-- ;;
-- "")
-- # If it fails, then pretend we aren't using GCC.
-- ac_prog=ld
-- ;;
-- *)
-- # If it is relative, then search for the first ld in PATH.
-- with_gnu_ld=unknown
-- ;;
-- esac
--elif test "$with_gnu_ld" = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
--$as_echo_n "checking for GNU ld... " >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
--$as_echo_n "checking for non-GNU ld... " >&6; }
++fi
+
- fi
--if test "${lt_cv_path_LD+set}" = set; then :
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl.exe
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test -z "$LD"; then
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-- lt_cv_path_LD="$ac_dir/$ac_prog"
-- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some variants of GNU ld only accept -v.
-- # Break only if it was the GNU/non-GNU ld that we prefer.
-- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-- *GNU* | *'with BFD'*)
-- test "$with_gnu_ld" != no && break
-- ;;
-- *)
-- test "$with_gnu_ld" != yes && break
-- ;;
-- esac
-- fi
-- done
-- IFS="$lt_save_ifs"
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+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_CC="$ac_tool_prefix$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
+
- fi
- fi
--
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
--$as_echo "$LD" >&6; }
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- # I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
-- lt_cv_prog_gnu_ld=yes
-- ;;
--*)
-- lt_cv_prog_gnu_ld=no
-- ;;
--esac
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
--$as_echo "$lt_cv_prog_gnu_ld" >&6; }
--with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
--$as_echo_n "checking for $LD option to reload object files... " >&6; }
--if test "${lt_cv_ld_reload_flag+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- lt_cv_ld_reload_flag='-r'
+ test -n "$CC" && break
-+ done
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
--$as_echo "$lt_cv_ld_reload_flag" >&6; }
--reload_flag=$lt_cv_ld_reload_flag
--case $reload_flag in
--"" | " "*) ;;
--*) reload_flag=" $reload_flag" ;;
--esac
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--case $host_os in
-- darwin*)
-- if test "$GCC" = yes; then
-- reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-- else
-- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-- fi
-- ;;
--esac
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
--$as_echo_n "checking for BSD-compatible nm... " >&6; }
--if test "${lt_cv_path_NM+set}" = set; then :
+ done
++fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
@@ -33730,117 +34011,51 @@ index e4c8adc..6d19a92 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test -n "$NM"; then
-- # Let the user override the test.
-- lt_cv_path_NM="$NM"
++ $as_echo_n "(cached) " >&6
++else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- # Tru64's nm complains that /dev/null is an invalid object file
-- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-- */dev/null* | *'Invalid file or object type'*)
-- lt_cv_path_NM="$tmp_nm -B"
-- break
-- ;;
-- *)
-- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-- */dev/null*)
-- lt_cv_path_NM="$tmp_nm -p"
-- break
-- ;;
-- *)
-- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-- ;;
-- esac
-- esac
-- fi
++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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
done
-- IFS="$lt_save_ifs"
-- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+IFS=$as_save_IFS
-+
- fi
+ IFS=$as_save_IFS
+- if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+- fi
+-else
+- ac_cv_path_EGREP=$EGREP
+-fi
+
+- fi
fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
--$as_echo "$lt_cv_path_NM" >&6; }
--NM="$lt_cv_path_NM"
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
--LN_S=$as_ln_s
--if test "$LN_S" = "ln -s"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+-$as_echo "$ac_cv_path_EGREP" >&6; }
+- EGREP="$ac_cv_path_EGREP"
++fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5
--$as_echo_n "checking how to recognise dependent libraries... " >&6; }
--if test "${lt_cv_deplibs_check_method+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given extended regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
--
--case $host_os in
--aix4* | aix5*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-
--beos*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
++fi
++
++
+ test -n "$ac_ct_CC" && break
+done
-
--bsdi[45]*)
-- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-- lt_cv_file_magic_cmd='/usr/bin/file -L'
-- lt_cv_file_magic_test_file=/shlib/libc.so
-- ;;
++
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -33853,42 +34068,15 @@ index e4c8adc..6d19a92 100755
+ CC=$ac_ct_CC
+ fi
+fi
-
--cygwin*)
-- # func_win32_libid is a shell function defined in ltmain.sh
-- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-- lt_cv_file_magic_cmd='func_win32_libid'
-- ;;
++
+fi
-
--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'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-- ;;
-
--darwin* | rhapsody*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
++
++
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- case $host_cpu in
-- i*86 )
-- # Not sure whether the presence of OpenBSD here was a mistake.
-- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-- ;;
-- esac
-- else
-- lt_cv_deplibs_check_method=pass_all
++
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
@@ -33908,36 +34096,15 @@ index e4c8adc..6d19a92 100755
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
- fi
-- ;;
++ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-
--gnu*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
++
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--hpux10.20* | hpux11*)
-- lt_cv_file_magic_cmd=/usr/bin/file
-- case $host_cpu in
-- ia64*)
-- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-- ;;
-- hppa*64*)
-- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-- ;;
-- *)
-- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-- lt_cv_file_magic_test_file=/usr/lib/libc.sl
-- ;;
-- esac
-- ;;
++
+int
+main ()
+{
@@ -34311,8 +34478,7 @@ index e4c8adc..6d19a92 100755
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
++struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -34408,8 +34574,8 @@ index e4c8adc..6d19a92 100755
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
++ # 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
@@ -34444,16 +34610,16 @@ index e4c8adc..6d19a92 100755
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++ # Solaris 10 /bin/sh.
++ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs
++ # handle '-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
@@ -34462,8 +34628,8 @@ index e4c8adc..6d19a92 100755
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
++ # After this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
@@ -34471,7 +34637,7 @@ index e4c8adc..6d19a92 100755
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-+ # This compiler won't grok `-c -o', but also, the minuso test has
++ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
@@ -34547,7 +34713,7 @@ index e4c8adc..6d19a92 100755
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
++ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
@@ -34623,7 +34789,7 @@ index e4c8adc..6d19a92 100755
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
@@ -34689,7 +34855,7 @@ index e4c8adc..6d19a92 100755
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
@@ -34756,7 +34922,7 @@ index e4c8adc..6d19a92 100755
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
++ as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+ # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
@@ -34821,13 +34987,14 @@ index e4c8adc..6d19a92 100755
+
+
+
-+
-+
-+
-+# Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then :
-+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
+
+
+
+@@ -6509,374 +7020,1874 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+ if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+- with_gnu_ld=no
+ with_gnu_ld=no
+fi
+
@@ -35012,7 +35179,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35056,7 +35223,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35480,7 +35647,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35520,7 +35687,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35673,14 +35840,14 @@ index e4c8adc..6d19a92 100755
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
-
- irix5* | irix6* | nonstopux*)
- case $LD in
-@@ -6787,96 +7833,1021 @@ irix5* | irix6* | nonstopux*)
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
-- lt_cv_deplibs_check_method=pass_all
++
++irix5* | irix6* | nonstopux*)
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
++ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
@@ -35823,7 +35990,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35863,7 +36030,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -35964,7 +36131,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36008,7 +36175,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36133,7 +36300,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36173,7 +36340,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36232,7 +36399,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36272,7 +36439,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -36290,8 +36457,34 @@ index e4c8adc..6d19a92 100755
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-+fi
-+
+ fi
+
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+-$as_echo_n "checking for ld used by $CC... " >&6; }
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [\\/]* | ?:[\\/]*)
+- re_direlt='/[^/][^/]*/\.\./'
+- # Canonicalize the pathname of ld
+- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+- ac_prog=ld
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
@@ -36323,13 +36516,22 @@ index e4c8adc..6d19a92 100755
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-+ ;;
-+ *)
+ ;;
+ *)
+- # If it is relative, then search for the first ld in PATH.
+- with_gnu_ld=unknown
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-+ ;;
-+ esac
+ ;;
+ esac
+-elif test "$with_gnu_ld" = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+-$as_echo_n "checking for GNU ld... " >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+-$as_echo_n "checking for non-GNU ld... " >&6; }
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-+fi
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
+
+case $host_os in
+ darwin*)
@@ -36390,8 +36592,26 @@ index e4c8adc..6d19a92 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- if test -z "$LD"; then
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD="$ac_dir/$ac_prog"
+- # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some variants of GNU ld only accept -v.
+- # Break only if it was the GNU/non-GNU ld that we prefer.
+- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+- *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break
+- ;;
+- *)
+- test "$with_gnu_ld" != yes && break
+- ;;
+- esac
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
@@ -36432,237 +36652,448 @@ index e4c8adc..6d19a92 100755
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
- ;;
++ ;;
+sysv4)
+ symcode='[DFNSTU]'
+ ;;
+esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++ symcode='[ABCDGIRSTW]' ;;
++esac
++
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++ ;;
++esac
++
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
++
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
++ # Write the raw and C identifiers.
++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
++ # Also find C++ and __fastcall symbols from MSVC++,
++ # which start with @ or ?.
++ lt_cv_sys_global_symbol_pipe="$AWK '"\
++" {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++" \$ 0!~/External *\|/{next};"\
++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++" {if(hide[section]) next};"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++" ' prfx=^$ac_symprfx"
++ else
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++ fi
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
++
++ # Check to see that the pipe works correctly.
++ pipe_works=no
++
++ rm -f conftest*
++ cat > conftest.$ac_ext <<_LT_EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
++
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ # Now try to grab the symbols.
++ nlist=conftest.nm
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
++ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && test -s "$nlist"; then
++ # Try sorting and uniquifying the output.
++ if sort "$nlist" | uniq > "$nlist"T; then
++ mv -f "$nlist"T "$nlist"
++ else
++ rm -f "$nlist"T
++ fi
++
++ # Make sure that we snagged all the symbols we need.
++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
++ cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data. */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++_LT_EOF
++ # Now generate the symbol file.
++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++
++ cat <<_LT_EOF >> conftest.$ac_ext
++
++/* The mapping between symbol names and symbols. */
++LT_DLSYM_CONST struct {
++ const char *name;
++ void *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[] =
++{
++ { "@PROGRAM@", (void *) 0 },
++_LT_EOF
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ cat <<\_LT_EOF >> conftest.$ac_ext
++ {0, (void *) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++ return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++ # Now try linking the two files.
++ mv conftest.$ac_objext conftstm.$ac_objext
++ lt_globsym_save_LIBS=$LIBS
++ lt_globsym_save_CFLAGS=$CFLAGS
++ LIBS="conftstm.$ac_objext"
++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
++ (eval $ac_link) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
++ pipe_works=yes
++ fi
++ LIBS=$lt_globsym_save_LIBS
++ CFLAGS=$lt_globsym_save_CFLAGS
++ else
++ echo "cannot find nm_test_func in $nlist" >&5
++ fi
++ else
++ echo "cannot find nm_test_var in $nlist" >&5
++ fi
++ else
++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ fi
+- done
+- IFS="$lt_save_ifs"
+-else
+- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
++ else
++ echo "$progname: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ fi
++ rm -rf conftest* conftst*
++
++ # Do not use the global_symbol_pipe unless it works.
++ if test "$pipe_works" = yes; then
++ break
++ else
++ lt_cv_sys_global_symbol_pipe=
++ fi
++done
++
+ fi
+
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+-$as_echo "$LD" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++ lt_cv_sys_global_symbol_to_cdecl=
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
++$as_echo "failed" >&6; }
+ else
+- # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+- lt_cv_prog_gnu_ld=yes
+- ;;
+-*)
+- lt_cv_prog_gnu_ld=no
+- ;;
+-esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
++$as_echo "ok" >&6; }
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+-$as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_ld_reload_flag='-r'
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
++ nm_file_list_spec='@'
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+- darwin*)
+- if test "$GCC" = yes; then
+- reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+- else
+- reload_cmds='$LD$reload_flag -o $output$reload_objs'
+- fi
+- ;;
+-esac
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$NM"; then
+- # Let the user override the test.
+- lt_cv_path_NM="$NM"
+-else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
+- break
+- ;;
+- *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
+- ;;
+- esac
+- esac
+- fi
+- done
+- IFS="$lt_save_ifs"
+- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+-$as_echo "$lt_cv_path_NM" >&6; }
+-NM="$lt_cv_path_NM"
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
+-LN_S=$as_ln_s
+-if test "$LN_S" = "ln -s"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
+-fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5
+-$as_echo_n "checking how to recognise dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
+
+-case $host_os in
+-aix4* | aix5*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+
+-beos*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+
+-bsdi[45]*)
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+- ;;
+
+-cygwin*)
+- # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='func_win32_libid'
+- ;;
+
+-mingw* | pw32*)
+- # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- ;;
+
+-darwin* | rhapsody*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- case $host_cpu in
+- i*86 )
+- # Not sure whether the presence of OpenBSD here was a mistake.
+- # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+- ;;
+- esac
+- else
+- lt_cv_deplibs_check_method=pass_all
+- fi
+- ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+
+-hpux10.20* | hpux11*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- case $host_cpu in
+- ia64*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+- ;;
+- hppa*64*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+- ;;
+- *)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+- lt_cv_file_magic_test_file=/usr/lib/libc.sl
+- ;;
+- esac
+- ;;
+
+-irix5* | irix6* | nonstopux*)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- lt_cv_deplibs_check_method=pass_all
+- ;;
-# This must be Linux ELF.
-linux*)
- lt_cv_deplibs_check_method=pass_all
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[ABCDGIRSTW]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-+esac
+- ;;
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+ # Write the raw and C identifiers.
-+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ # Fake it for dumpbin and say T for any non-static function
-+ # and D for any global variable.
-+ # Also find C++ and __fastcall symbols from MSVC++,
-+ # which start with @ or ?.
-+ lt_cv_sys_global_symbol_pipe="$AWK '"\
-+" {last_section=section; section=\$ 3};"\
-+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+" \$ 0!~/External *\|/{next};"\
-+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+" {if(hide[section]) next};"\
-+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+" ' prfx=^$ac_symprfx"
- else
+- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
+- fi
- ;;
-+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+
-+ # Make sure that we snagged all the symbols we need.
-+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+ relocations are performed -- see ld's documentation on pseudo-relocs. */
-+# define LT_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data. */
-+# define LT_DLSYM_CONST
-+#else
-+# define LT_DLSYM_CONST const
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+ cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols. */
-+LT_DLSYM_CONST struct {
-+ const char *name;
-+ void *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[] =
-+{
-+ { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+ cat <<\_LT_EOF >> conftest.$ac_ext
-+ {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_globsym_save_LIBS=$LIBS
-+ lt_globsym_save_CFLAGS=$CFLAGS
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS=$lt_globsym_save_LIBS
-+ CFLAGS=$lt_globsym_save_CFLAGS
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&5
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&5
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+ fi
- else
+- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+ echo "$progname: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- fi
+- fi
- ;;
-+ rm -rf conftest* conftst*
-+
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+
-+fi
-+
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+$as_echo "ok" >&6; }
-+fi
-+
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-+ nm_file_list_spec='@'
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
@@ -36708,16 +37139,6 @@ index e4c8adc..6d19a92 100755
+
+
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
@@ -36765,7 +37186,7 @@ index e4c8adc..6d19a92 100755
# Check whether --enable-libtool-lock was given.
-@@ -6898,94 +8869,101 @@ ia64-*-hpux*)
+@@ -6898,54 +8909,154 @@ ia64-*-hpux*)
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -36788,11 +37209,12 @@ index e4c8adc..6d19a92 100755
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6913 "configure"' > conftest.$ac_ext
-- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
@@ -36816,36 +37238,6 @@ index e4c8adc..6d19a92 100755
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
-- esac
-- fi
-- fi
-- rm -rf conftest*
-- ;;
--
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-- # Find out which ABI we are using.
-- echo 'int i;' > conftest.$ac_ext
-+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- case `/usr/bin/file conftest.o` in
-- *32-bit*)
-- case $host in
-- x86_64-*linux*)
-- LD="${LD-ld} -m elf_i386"
-- ;;
-- ppc64-*linux*|powerpc64-*linux*)
-- LD="${LD-ld} -m elf32ppclinux"
-- ;;
-- s390x-*linux*)
-- LD="${LD-ld} -m elf_s390"
-- ;;
-- sparc64-*linux*)
-- LD="${LD-ld} -m elf32_sparc"
-- ;;
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
@@ -36857,22 +37249,7 @@ index e4c8adc..6d19a92 100755
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
- esac
-- ;;
-- *64-bit*)
-- case $host in
-- x86_64-*linux*)
-- LD="${LD-ld} -m elf_x86_64"
-- ;;
-- ppc*-*linux*|powerpc*-*linux*)
-- LD="${LD-ld} -m elf64ppc"
-- ;;
-- s390*-*linux*)
-- LD="${LD-ld} -m elf64_s390"
-- ;;
-- sparc*-*linux*)
-- LD="${LD-ld} -m elf64_sparc"
-- ;;
++ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
@@ -36884,8 +37261,7 @@ index e4c8adc..6d19a92 100755
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
- esac
-- ;;
++ esac
+ fi
+ fi
+ rm -rf conftest*
@@ -36940,46 +37316,102 @@ index e4c8adc..6d19a92 100755
+ esac
+ ;;
esac
+- fi
fi
rm -rf conftest*
-@@ -6997,7 +8975,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|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; }
--if test "${lt_cv_cc_needs_belf+set}" = set; then :
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++*-*-sco3.2v5*)
++ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -belf"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
++$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_ext=c
-@@ -7037,18 +9015,361 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
-- ;;
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
--set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++ $as_echo_n "(cached) " >&6
++else
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ lt_cv_cc_needs_belf=yes
++else
++ lt_cv_cc_needs_belf=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
++$as_echo "$lt_cv_cc_needs_belf" >&6; }
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++ CFLAGS="$SAVE_CFLAGS"
++ fi
+ ;;
+*-*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
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ case `/usr/bin/file conftest.o` in
-+ *64-bit*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -6954,101 +9065,351 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.o` in
+- *32-bit*)
+- case $host in
+- x86_64-*linux*)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- ppc64-*linux*|powerpc64-*linux*)
+- LD="${LD-ld} -m elf32ppclinux"
+- ;;
+- s390x-*linux*)
+- LD="${LD-ld} -m elf_s390"
+- ;;
+- sparc64-*linux*)
+- LD="${LD-ld} -m elf32_sparc"
+- ;;
+- esac
+- ;;
+ *64-bit*)
+- case $host in
+- x86_64-*linux*)
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+ i?86-*-solaris*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
+- LD="${LD-ld} -m elf64ppc"
+- ;;
+- s390*-*linux*)
+- LD="${LD-ld} -m elf64_s390"
+- ;;
+- sparc*-*linux*)
+ sparc*-*-solaris*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
+ 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
@@ -36991,10 +37423,12 @@ index e4c8adc..6d19a92 100755
+ LD="${LD-ld} -64"
+ fi
+ ;;
-+ esac
-+ ;;
-+ esac
-+ fi
+ esac
+ ;;
+ esac
+ fi
+- rm -rf conftest*
+- ;;
+ rm -rf conftest*
+ ;;
+esac
@@ -37018,7 +37452,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37058,7 +37492,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37138,7 +37572,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37178,7 +37612,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37212,15 +37646,27 @@ index e4c8adc..6d19a92 100755
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
-+
+
+-*-*-sco3.2v5*)
+- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -belf"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
@@ -37230,7 +37676,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37238,7 +37684,9 @@ index e4c8adc..6d19a92 100755
+done
+ done
+IFS=$as_save_IFS
-+
+
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
@@ -37249,9 +37697,27 @@ index e4c8adc..6d19a92 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
-+
-+
-+fi
+
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- lt_cv_cc_needs_belf=yes
+-else
+- lt_cv_cc_needs_belf=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
@@ -37270,7 +37736,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -37278,8 +37744,13 @@ index e4c8adc..6d19a92 100755
+done
+ done
+IFS=$as_save_IFS
-+
-+fi
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS="$SAVE_CFLAGS"
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
@@ -37300,7 +37771,12 @@ index e4c8adc..6d19a92 100755
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
-+ fi
+ fi
+- ;;
+-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
@@ -37321,16 +37797,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7057,7 +9378,7 @@ do
+@@ -7056,8 +9417,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7067,10 +9388,10 @@ IFS=$as_save_IFS
+@@ -7067,10 +9428,10 @@ IFS=$as_save_IFS
fi
fi
@@ -37345,7 +37823,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -7078,17 +9399,17 @@ fi
+@@ -7078,17 +9439,17 @@ fi
fi
@@ -37370,16 +37848,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7097,7 +9418,7 @@ do
+@@ -7096,8 +9457,8 @@ 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
+- 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_DLLTOOL="dlltool"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7107,17 +9428,17 @@ IFS=$as_save_IFS
+@@ -7107,17 +9468,17 @@ IFS=$as_save_IFS
fi
fi
@@ -37403,7 +37883,7 @@ index e4c8adc..6d19a92 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -7125,22 +9446,22 @@ yes:)
+@@ -7125,22 +9486,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -37434,16 +37914,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7149,7 +9470,7 @@ do
+@@ -7148,8 +9509,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7159,10 +9480,10 @@ IFS=$as_save_IFS
+@@ -7159,10 +9520,10 @@ IFS=$as_save_IFS
fi
fi
@@ -37458,7 +37940,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -7170,17 +9491,17 @@ fi
+@@ -7170,17 +9531,17 @@ fi
fi
@@ -37483,16 +37965,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7189,7 +9510,7 @@ do
+@@ -7188,8 +9549,8 @@ 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
+- 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_AS="as"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7199,17 +9520,17 @@ IFS=$as_save_IFS
+@@ -7199,17 +9560,17 @@ IFS=$as_save_IFS
fi
fi
@@ -37516,7 +38000,7 @@ index e4c8adc..6d19a92 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -7217,22 +9538,22 @@ yes:)
+@@ -7217,22 +9578,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -37547,16 +38031,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7241,7 +9562,7 @@ do
+@@ -7240,8 +9601,8 @@ 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
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7251,10 +9572,10 @@ IFS=$as_save_IFS
+@@ -7251,10 +9612,10 @@ IFS=$as_save_IFS
fi
fi
@@ -37571,7 +38057,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -7262,17 +9583,17 @@ fi
+@@ -7262,17 +9623,17 @@ fi
fi
@@ -37596,16 +38082,18 @@ index e4c8adc..6d19a92 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7281,7 +9602,7 @@ do
+@@ -7280,8 +9641,8 @@ 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
+- 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_OBJDUMP="objdump"
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7291,17 +9612,17 @@ IFS=$as_save_IFS
+@@ -7291,17 +9652,17 @@ IFS=$as_save_IFS
fi
fi
@@ -37629,7 +38117,7 @@ index e4c8adc..6d19a92 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -7309,19 +9630,176 @@ yes:)
+@@ -7309,19 +9670,176 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -37811,7 +38299,7 @@ index e4c8adc..6d19a92 100755
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7334,7 +9812,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+@@ -7334,7 +9852,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
@@ -37820,7 +38308,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7364,7 +9842,7 @@ else
+@@ -7364,7 +9882,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -37829,7 +38317,7 @@ index e4c8adc..6d19a92 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7380,11 +9858,11 @@ else
+@@ -7380,11 +9898,11 @@ else
ac_preproc_ok=:
break
fi
@@ -37843,7 +38331,7 @@ index e4c8adc..6d19a92 100755
if $ac_preproc_ok; then :
break
fi
-@@ -7423,7 +9901,7 @@ else
+@@ -7423,7 +9941,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -37852,7 +38340,7 @@ index e4c8adc..6d19a92 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -7439,18 +9917,18 @@ else
+@@ -7439,18 +9957,18 @@ else
ac_preproc_ok=:
break
fi
@@ -37875,7 +38363,7 @@ index e4c8adc..6d19a92 100755
fi
ac_ext=c
-@@ -7462,7 +9940,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -7462,7 +9980,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -37884,7 +38372,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -7579,8 +10057,7 @@ do :
+@@ -7579,8 +10097,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
"
@@ -37894,7 +38382,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7592,8 +10069,9 @@ done
+@@ -7592,8 +10109,9 @@ done
for ac_header in dlfcn.h
do :
@@ -37906,7 +38394,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
-@@ -7603,692 +10081,197 @@ fi
+@@ -7603,693 +10121,198 @@ fi
done
@@ -38003,7 +38491,11 @@ index e4c8adc..6d19a92 100755
- ;;
- esac
-+
+-fi
+
+-if test -n $lt_cv_sys_max_cmd_len ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+
+
+
@@ -38025,17 +38517,21 @@ index e4c8adc..6d19a92 100755
+ IFS="$lt_save_ifs"
+ ;;
+ esac
-+else
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+-$as_echo "none" >&6; }
+ pic_mode=default
fi
--if test -n $lt_cv_sys_max_cmd_len ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
--$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+
+
+test -z "$pic_mode" && pic_mode=default
-+
-+
+
+
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+
+
+
@@ -38061,21 +38557,9 @@ index e4c8adc..6d19a92 100755
+ ;;
+ esac
else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
--$as_echo "none" >&6; }
+ enable_fast_install=yes
- fi
-
-
-
++fi
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
--$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
--
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
@@ -38140,22 +38624,22 @@ index e4c8adc..6d19a92 100755
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
- # Check to see that the pipe works correctly.
- pipe_works=no
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
@@ -38406,9 +38890,6 @@ index e4c8adc..6d19a92 100755
-done
- done
-IFS=$as_save_IFS
-+test -z "$LN_S" && LN_S="ln -s"
-+
-+
-fi
-fi
@@ -38461,6 +38942,7 @@ index e4c8adc..6d19a92 100755
-done
- done
-IFS=$as_save_IFS
++test -z "$LN_S" && LN_S="ln -s"
-fi
-fi
@@ -38566,9 +39048,7 @@ index e4c8adc..6d19a92 100755
-fi
-+if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
- fi
+-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
@@ -38576,19 +39056,11 @@ index e4c8adc..6d19a92 100755
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
-+if ${lt_cv_objdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+ rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
- else
+-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
@@ -38603,18 +39075,35 @@ index e4c8adc..6d19a92 100755
-done
- done
-IFS=$as_save_IFS
--
--fi
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
+
++
++
++
++
++if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
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}: checking for objdir" >&5
++$as_echo_n "checking for objdir... " >&6; }
++if ${lt_cv_objdir+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
++ rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++ lt_cv_objdir=.libs
++else
++ # MS-DOS does not allow filenames that begin with a dot.
++ lt_cv_objdir=_libs
++fi
+rmdir .libs 2>/dev/null
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
@@ -38656,25 +39145,29 @@ index e4c8adc..6d19a92 100755
-fi
+ ;;
+esac
-
++
+# Global variables:
+ofile=libtool
+can_build_shared=yes
-
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
++
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
--# Set sane defaults for various variables
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+
+ # Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$LTCC" && LTCC=$CC
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
@@ -38682,16 +39175,13 @@ index e4c8adc..6d19a92 100755
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
+ test -z "$ac_objext" && ac_objext=o
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-
+-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
@@ -38703,16 +39193,11 @@ index e4c8adc..6d19a92 100755
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-
+-
for cc_temp in $compiler""; do
case $cc_temp in
-@@ -8298,16 +10281,17 @@ for cc_temp in $compiler""; do
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+@@ -8298,16 +10321,17 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -38732,7 +39217,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8332,7 +10316,7 @@ else
+@@ -8332,7 +10356,7 @@ else
$EGREP "$file_magic_regex" > /dev/null; then
:
else
@@ -38741,7 +39226,7 @@ index e4c8adc..6d19a92 100755
*** Warning: the command libtool uses to detect shared libraries,
*** $file_magic_cmd, produces output that libtool cannot recognize.
-@@ -8343,7 +10327,7 @@ else
+@@ -8343,7 +10367,7 @@ else
*** may want to report the problem to your system manager and/or to
*** bug-libtool at gnu.org
@@ -38750,7 +39235,7 @@ index e4c8adc..6d19a92 100755
fi ;;
esac
fi
-@@ -8365,11 +10349,15 @@ else
+@@ -8365,11 +10389,15 @@ else
$as_echo "no" >&6; }
fi
@@ -38767,7 +39252,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8394,7 +10382,7 @@ else
+@@ -8394,7 +10422,7 @@ else
$EGREP "$file_magic_regex" > /dev/null; then
:
else
@@ -38776,7 +39261,7 @@ index e4c8adc..6d19a92 100755
*** Warning: the command libtool uses to detect shared libraries,
*** $file_magic_cmd, produces output that libtool cannot recognize.
-@@ -8405,7 +10393,7 @@ else
+@@ -8405,7 +10433,7 @@ else
*** may want to report the problem to your system manager and/or to
*** bug-libtool at gnu.org
@@ -38785,7 +39270,7 @@ index e4c8adc..6d19a92 100755
fi ;;
esac
fi
-@@ -8427,6 +10415,7 @@ else
+@@ -8427,6 +10455,7 @@ else
$as_echo "no" >&6; }
fi
@@ -38793,7 +39278,7 @@ index e4c8adc..6d19a92 100755
else
MAGIC_CMD=:
fi
-@@ -8436,28 +10425,8 @@ fi
+@@ -8436,28 +10465,8 @@ fi
;;
esac
@@ -38823,7 +39308,7 @@ index e4c8adc..6d19a92 100755
lt_save_CC="$CC"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -8474,113 +10443,64 @@ objext=o
+@@ -8474,113 +10483,64 @@ objext=o
objext=$objext
# Code to be used in simple compile tests
@@ -38967,7 +39452,7 @@ index e4c8adc..6d19a92 100755
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8591,21 +10511,21 @@ else
+@@ -8591,21 +10551,21 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -38995,7 +39480,7 @@ index e4c8adc..6d19a92 100755
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-@@ -8619,12 +10539,15 @@ fi
+@@ -8619,12 +10579,15 @@ fi
fi
@@ -39014,7 +39499,7 @@ index e4c8adc..6d19a92 100755
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -8640,19 +10563,29 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8640,19 +10603,29 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
amigaos*)
@@ -39050,7 +39535,7 @@ index e4c8adc..6d19a92 100755
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8662,6 +10595,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8662,6 +10635,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
@@ -39082,7 +39567,7 @@ index e4c8adc..6d19a92 100755
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -8669,29 +10627,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8669,29 +10667,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
enable_shared=no
;;
@@ -39127,7 +39612,7 @@ index e4c8adc..6d19a92 100755
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8704,18 +10664,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8704,18 +10704,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -39147,7 +39632,7 @@ index e4c8adc..6d19a92 100755
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -8743,19 +10693,34 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8743,19 +10733,34 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_static='-non_shared'
;;
@@ -39190,7 +39675,7 @@ index e4c8adc..6d19a92 100755
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8767,25 +10732,72 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8767,25 +10772,72 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -39267,7 +39752,7 @@ index e4c8adc..6d19a92 100755
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8798,7 +10810,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8798,7 +10850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_static='-Bstatic'
;;
@@ -39276,7 +39761,7 @@ index e4c8adc..6d19a92 100755
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -8811,6 +10823,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8811,6 +10863,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
fi
;;
@@ -39289,7 +39774,7 @@ index e4c8adc..6d19a92 100755
unicos*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_can_build_shared=no
-@@ -8827,84 +10845,204 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8827,22 +10885,39 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
esac
fi
@@ -39315,61 +39800,81 @@ index e4c8adc..6d19a92 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ 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 "$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; }
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- lt_prog_compiler_pic_works=no
+- ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8853,27 +10928,27 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8860: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+- $SED '/^$/d' conftest.err >conftest.er2
+- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works=yes
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
-+ fi
-+ fi
+ fi
+ fi
+- $rm conftest*
+ $RM conftest*
-+
-+fi
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works" >&5
+-$as_echo "$lt_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+
+
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+ case $lt_prog_compiler_pic in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic=
-+ lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
-+
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -8884,27 +10959,130 @@ else
+ fi
+
+ fi
+-case $host_os in
+- # For platforms which do not support PIC, -DPIC is meaningless:
+- *djgpp*)
+- lt_prog_compiler_pic=
+- ;;
+- *)
+- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+- ;;
+-esac
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+
+
+
@@ -39423,26 +39928,15 @@ index e4c8adc..6d19a92 100755
+
+
+
-
--#
--# Check to make sure the PIC flag actually works.
--#
--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; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then :
++
++
+
+
+ { $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; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- lt_prog_compiler_pic_works=no
-- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++ $as_echo_n "(cached) " >&6
++else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
@@ -39451,41 +39945,29 @@ index e4c8adc..6d19a92 100755
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
-- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
-- (eval "$lt_compile" 2>conftest.err)
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ lt_compile=`echo "$ac_compile" | $SED \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
-- cat conftest.err >&5
-- echo "$as_me:8860: \$? = $ac_status" >&5
-- if (exit $ac_status) && test -s "$ac_outfile"; then
++ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
- # The compiler can only warn and ignore the option if not recognized
-- # So say no if there are warnings other than the usual output.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works=yes
++ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
- fi
- fi
-- $rm conftest*
++ fi
++ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
@@ -39495,37 +39977,15 @@ index e4c8adc..6d19a92 100755
+ cd ..
+ $RM -r conftest
+ $RM conftest*
-
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works" >&5
--$as_echo "$lt_prog_compiler_pic_works" >&6; }
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
-
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-- case $lt_prog_compiler_pic in
-- "" | " "*) ;;
-- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-- esac
--else
-- lt_prog_compiler_pic=
-- lt_prog_compiler_can_build_shared=no
--fi
-
--fi
--case $host_os in
-- # For platforms which do not support PIC, -DPIC is meaningless:
-- *djgpp*)
-- lt_prog_compiler_pic=
-- ;;
-- *)
-- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-- ;;
--esac
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
++
++
++
+
+ { $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; }
@@ -39544,7 +40004,7 @@ index e4c8adc..6d19a92 100755
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8915,43 +11053,45 @@ else
+@@ -8915,43 +11093,45 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -39601,7 +40061,7 @@ index e4c8adc..6d19a92 100755
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
-@@ -8967,31 +11107,38 @@ else
+@@ -8967,31 +11147,38 @@ else
need_locks=no
fi
@@ -39651,7 +40111,7 @@ index e4c8adc..6d19a92 100755
# include_expsyms should be a list of space-separated symbols to be *always*
# included in the symbol list
include_expsyms=
-@@ -8999,26 +11146,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -8999,26 +11186,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -39681,7 +40141,7 @@ index e4c8adc..6d19a92 100755
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
-@@ -9026,13 +11164,43 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+@@ -9026,13 +11204,43 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
with_gnu_ld=no
fi
;;
@@ -39725,7 +40185,7 @@ index e4c8adc..6d19a92 100755
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9040,16 +11208,17 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+@@ -9040,16 +11248,17 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
@@ -39749,7 +40209,7 @@ index e4c8adc..6d19a92 100755
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9059,38 +11228,40 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+@@ -9059,38 +11268,40 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
@@ -39808,7 +40268,7 @@ index e4c8adc..6d19a92 100755
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
-@@ -9100,17 +11271,19 @@ EOF
+@@ -9100,17 +11311,19 @@ EOF
fi
;;
@@ -39833,7 +40293,7 @@ index e4c8adc..6d19a92 100755
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9119,57 +11292,120 @@ EOF
+@@ -9119,57 +11332,120 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -39909,8 +40369,7 @@ index e4c8adc..6d19a92 100755
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
- esac
-- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -39918,7 +40377,8 @@ index e4c8adc..6d19a92 100755
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
-+ esac
+ esac
+- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test $supports_anon_versioning = yes; then
@@ -39977,7 +40437,7 @@ index e4c8adc..6d19a92 100755
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
-@@ -9178,15 +11414,46 @@ EOF
+@@ -9178,15 +11454,46 @@ EOF
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
@@ -40028,7 +40488,7 @@ index e4c8adc..6d19a92 100755
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9195,9 +11462,9 @@ EOF
+@@ -9195,9 +11502,9 @@ EOF
;;
*)
@@ -40041,7 +40501,7 @@ index e4c8adc..6d19a92 100755
else
ld_shlibs=no
fi
-@@ -9220,14 +11487,14 @@ EOF
+@@ -9220,14 +11527,14 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -40058,7 +40518,7 @@ index e4c8adc..6d19a92 100755
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -9237,23 +11504,26 @@ EOF
+@@ -9237,23 +11544,26 @@ 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
@@ -40093,7 +40553,7 @@ index e4c8adc..6d19a92 100755
esac
exp_sym_flag='-bexport'
-@@ -9268,29 +11538,32 @@ EOF
+@@ -9268,29 +11578,32 @@ EOF
archive_cmds=''
hardcode_direct=yes
@@ -40138,7 +40598,7 @@ index e4c8adc..6d19a92 100755
esac
shared_flag='-shared'
if test "$aix_use_runtimelinking" = yes; then
-@@ -9299,18 +11572,19 @@ EOF
+@@ -9299,18 +11612,19 @@ EOF
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -40162,7 +40622,7 @@ index e4c8adc..6d19a92 100755
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
-@@ -9318,8 +11592,15 @@ EOF
+@@ -9318,8 +11632,15 @@ EOF
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -40180,7 +40640,7 @@ index e4c8adc..6d19a92 100755
/* end confdefs.h. */
int
-@@ -9332,26 +11613,47 @@ main ()
+@@ -9332,26 +11653,47 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -40210,13 +40670,13 @@ index e4c8adc..6d19a92 100755
+ fi
+
+fi
++
++ aix_libpath=$lt_cv_aix_libpath_
++fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
-+ aix_libpath=$lt_cv_aix_libpath_
-+fi
-+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
@@ -40240,7 +40700,7 @@ index e4c8adc..6d19a92 100755
/* end confdefs.h. */
int
-@@ -9364,113 +11666,163 @@ main ()
+@@ -9364,113 +11706,163 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -40482,7 +40942,7 @@ index e4c8adc..6d19a92 100755
;;
dgux*)
-@@ -9479,10 +11831,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9479,10 +11871,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_shlibpath_var=no
;;
@@ -40493,7 +40953,7 @@ index e4c8adc..6d19a92 100755
# 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
-@@ -9495,7 +11843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9495,7 +11883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -40502,7 +40962,7 @@ index e4c8adc..6d19a92 100755
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9503,8 +11851,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9503,8 +11891,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -40513,7 +40973,7 @@ index e4c8adc..6d19a92 100755
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9512,9 +11860,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9512,9 +11900,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
@@ -40525,7 +40985,7 @@ index e4c8adc..6d19a92 100755
fi
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
-@@ -9526,48 +11874,101 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9526,48 +11914,101 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
export_dynamic_flag_spec='${wl}-E'
;;
@@ -40649,7 +41109,7 @@ index e4c8adc..6d19a92 100755
export_dynamic_flag_spec='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
-@@ -9580,18 +11981,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9580,18 +12021,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -40703,7 +41163,7 @@ index e4c8adc..6d19a92 100755
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-@@ -9609,25 +12041,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9609,25 +12081,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_shlibpath_var=no
;;
@@ -40754,7 +41214,7 @@ index e4c8adc..6d19a92 100755
fi
;;
-@@ -9635,18 +12075,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9635,18 +12115,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -40778,7 +41238,7 @@ index e4c8adc..6d19a92 100755
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
-@@ -9654,57 +12095,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9654,57 +12135,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -40869,7 +41329,7 @@ index e4c8adc..6d19a92 100755
esac
link_all_deplibs=yes
;;
-@@ -9761,36 +12204,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9761,36 +12244,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
;;
@@ -40936,7 +41396,7 @@ index e4c8adc..6d19a92 100755
;;
uts4*)
-@@ -9803,16 +12255,35 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9803,16 +12295,35 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
ld_shlibs=no
;;
esac
@@ -40976,7 +41436,7 @@ index e4c8adc..6d19a92 100755
#
# Do we need to explicitly link libc?
-@@ -9833,2220 +12304,1696 @@ x|xyes)
+@@ -9833,2220 +12344,1696 @@ 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; }
@@ -42026,17 +42486,104 @@ index e4c8adc..6d19a92 100755
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+- }
+
+- exit (status);
+-}
+-EOF
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) >&5 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self=no
+- fi
+-fi
+-rm -fr conftest*
+
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+-$as_echo "$lt_cv_dlopen_self" >&6; }
+
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- { $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; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 10888 "configure"
+-#include "confdefs.h"
+
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+
+-#include <stdio.h>
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+
+
+
@@ -42152,6 +42699,26 @@ index e4c8adc..6d19a92 100755
+ }
+ }
}
+-
+- exit (status);
+-}
+-EOF
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) >&5 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self_static=no
+- fi
+ }
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
@@ -42165,7 +42732,8 @@ index e4c8adc..6d19a92 100755
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
+ fi
+-rm -fr conftest*
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
@@ -42182,24 +42750,13 @@ index e4c8adc..6d19a92 100755
+need_lib_prefix=unknown
+hardcode_into_libs=no
-- exit (status);
--}
--EOF
-- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) >&5 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
-+
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+case $host_os in
+aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
@@ -42235,10 +42792,7 @@ index e4c8adc..6d19a92 100755
+ can_build_shared=no
+ fi
+ ;;
- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self=no
++ esac
+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
@@ -42252,33 +42806,14 @@ index e4c8adc..6d19a92 100755
+ # and later when we are not doing run time linking.
+ library_names_spec='${libname}${release}.a $libname.a'
+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
+ fi
+ shlibpath_var=LIBPATH
- fi
--fi
--rm -fr conftest*
--
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
--$as_echo "$lt_cv_dlopen_self" >&6; }
++ fi
+ ;;
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- { $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; }
--if test "${lt_cv_dlopen_self_static+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 10888 "configure"
--#include "confdefs.h"
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+amigaos*)
+ case $host_cpu in
+ powerpc)
@@ -42290,20 +42825,25 @@ index e4c8adc..6d19a92 100755
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+ esac
+ ;;
+ esac
+ ;;
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
--#include <stdio.h>
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
+-fi
+bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
@@ -42317,43 +42857,13 @@ index e4c8adc..6d19a92 100755
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
++
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
@@ -42373,19 +42883,19 @@ index e4c8adc..6d19a92 100755
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-# Report which librarie types wil actually be built
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+-$as_echo "$can_build_shared" >&6; }
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+-$as_echo_n "checking whether to build shared libraries... " >&6; }
+-test "$can_build_shared" = "no" && enable_shared=no
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
+ mingw* | cegcc*)
@@ -42399,33 +42909,13 @@ index e4c8adc..6d19a92 100755
+ esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
++
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
-
-- exit (status);
--}
--EOF
-- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) >&5 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
@@ -42461,14 +42951,8 @@ index e4c8adc..6d19a92 100755
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self_static=no
-- fi
--fi
--rm -fr conftest*
-
++ esac
++
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
@@ -42481,29 +42965,17 @@ index e4c8adc..6d19a92 100755
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
+ ;;
-
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
--$as_echo "$lt_cv_dlopen_self_static" >&6; }
-- fi
--
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
++
+ *)
+ # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
- ;;
- esac
++ ;;
++ esac
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
-
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
++
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
@@ -42515,88 +42987,6 @@ index e4c8adc..6d19a92 100755
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- case $lt_cv_dlopen_self_static in
-- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-- *) enable_dlopen_self_static=unknown ;;
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[23].*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2.*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 4.6 on, and DragonFly
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
--fi
--
--
--# Report which librarie types wil actually be built
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
--$as_echo_n "checking if libtool supports shared libraries... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
--$as_echo "$can_build_shared" >&6; }
-+ ;;
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
--$as_echo_n "checking whether to build shared libraries... " >&6; }
--test "$can_build_shared" = "no" && enable_shared=no
-+gnu*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
@@ -42606,90 +42996,32 @@ index e4c8adc..6d19a92 100755
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
-+haiku*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ dynamic_linker="$host_os runtime_loader"
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ 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
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case $host_cpu in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
+- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+ postinstall_cmds='chmod 555 $lib'
-+ # or fails outright, so override atomically:
-+ install_override_mode=555
-+ ;;
-
+-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-+interix[3-9]*)
++dgux*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
+ ;;
-# The else clause should only fire when bootstrapping the
@@ -42701,7 +43033,17 @@ index e4c8adc..6d19a92 100755
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-- fi
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[23].*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
+ fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
@@ -42765,49 +43107,45 @@ index e4c8adc..6d19a92 100755
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-- ;;
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
- *)
++ version_type=freebsd-$objformat
++ case $version_type in
++ freebsd-elf*)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ need_version=no
++ need_lib_prefix=no
+ ;;
+- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-- ;;
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
- esac
++ freebsd-*)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ need_version=yes
+ ;;
+- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++ esac
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_os in
++ freebsd2.*)
++ shlibpath_overrides_runpath=yes
++ ;;
++ freebsd3.[01]* | freebsdelf3.[01]*)
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
;;
esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
+ ;;
-cfgfile="${ofile}T"
@@ -42873,42 +43211,148 @@ index e4c8adc..6d19a92 100755
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
--
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
--
++haiku*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ dynamic_linker="$host_os runtime_loader"
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ 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
++ ;;
+
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
--
++hpux9* | hpux10* | hpux11*)
++ # Give a soname corresponding to the major version so that dld.sl refuses to
++ # link against other versions.
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ case $host_cpu in
++ ia64*)
++ shrext_cmds='.so'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.so"
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++ else
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
++ esac
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ postinstall_cmds='chmod 555 $lib'
++ # or fails outright, so override atomically:
++ install_override_mode=555
++ ;;
+
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
--
++interix[3-9]*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
--
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux # correct to gnu/linux during the next big refactor
++ else
++ version_type=irix
++ fi ;;
++ esac
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
++ ;;
++ esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
++ ;;
+
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
--# A language-specific compiler.
--CC=$lt_compiler
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
@@ -42920,8 +43364,9 @@ index e4c8adc..6d19a92 100755
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ # Some binutils ld are patched to set DT_RUNPATH
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
@@ -42934,14 +43379,14 @@ index e4c8adc..6d19a92 100755
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# A C compiler.
+-LTCC=$lt_LTCC
+int
+main ()
+{
--# The linker used to build libraries.
--LD=$lt_LD
+-# A language-specific compiler.
+-CC=$lt_compiler
+ ;
+ return 0;
+}
@@ -42956,39 +43401,39 @@ index e4c8adc..6d19a92 100755
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC
+fi
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
--# A symbol stripping program
--STRIP=$lt_STRIP
+-# The linker used to build libraries.
+-LD=$lt_LD
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+ fi
--# Used on cygwin: assembler.
--AS="$AS"
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
@@ -42998,8 +43443,8 @@ index e4c8adc..6d19a92 100755
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -43018,9 +43463,8 @@ index e4c8adc..6d19a92 100755
+ hardcode_into_libs=yes
+ ;;
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -43028,8 +43472,8 @@ index e4c8adc..6d19a92 100755
+ shlibpath_overrides_runpath=yes
+ ;;
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl
+-# Used on cygwin: assembler.
+-AS="$AS"
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
@@ -43042,8 +43486,8 @@ index e4c8adc..6d19a92 100755
+ dynamic_linker='ldqnx.so'
+ ;;
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
@@ -43070,8 +43514,9 @@ index e4c8adc..6d19a92 100755
+ fi
+ ;;
--# Old archive suffix (normally "a").
--libext="$libext"
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
@@ -43081,8 +43526,8 @@ index e4c8adc..6d19a92 100755
+ shlibpath_var=LIBPATH
+ ;;
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
@@ -43094,15 +43539,14 @@ index e4c8adc..6d19a92 100755
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+rdos*)
+ dynamic_linker=no
+ ;;
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic
--pic_mode=$pic_mode
+-# Old archive suffix (normally "a").
+-libext="$libext"
+solaris*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
@@ -43116,8 +43560,8 @@ index e4c8adc..6d19a92 100755
+ postinstall_cmds='chmod +x $lib'
+ ;;
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -43130,8 +43574,8 @@ index e4c8adc..6d19a92 100755
+ need_version=yes
+ ;;
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -43155,8 +43599,9 @@ index e4c8adc..6d19a92 100755
+ esac
+ ;;
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic
+-pic_mode=$pic_mode
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
@@ -43166,8 +43611,8 @@ index e4c8adc..6d19a92 100755
+ fi
+ ;;
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -43190,8 +43635,8 @@ index e4c8adc..6d19a92 100755
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
--# Do we need a version for libraries?
--need_version=$need_version
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux # correct to gnu/linux during the next big refactor
@@ -43203,8 +43648,8 @@ index e4c8adc..6d19a92 100755
+ hardcode_into_libs=yes
+ ;;
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -43212,8 +43657,8 @@ index e4c8adc..6d19a92 100755
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+*)
+ dynamic_linker=no
+ ;;
@@ -43222,15 +43667,15 @@ index e4c8adc..6d19a92 100755
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# Do we need a version for libraries?
+-need_version=$need_version
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
@@ -43238,6 +43683,15 @@ index e4c8adc..6d19a92 100755
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static
+
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -43598,31 +44052,7 @@ index e4c8adc..6d19a92 100755
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-+
-+
-+
-+
-+
-+ { $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=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+ test -n "$runpath_var" ||
-+ test "X$hardcode_automatic" = "Xyes" ; then
-+
-+ # We can hardcode non-existent directories.
-+ if test "$hardcode_direct" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+ test "$hardcode_minus_L" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action=immediate
- fi
+- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
@@ -43692,6 +44122,36 @@ index e4c8adc..6d19a92 100755
- ;;
- esac
- done
+
+- case $lt_echo in
+- *'\$0 --fallback-echo"')
+- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+- ;;
+- esac
+
+-cfgfile="$ofile"
++ { $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=
++if test -n "$hardcode_libdir_flag_spec" ||
++ test -n "$runpath_var" ||
++ test "X$hardcode_automatic" = "Xyes" ; then
+
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++ # We can hardcode non-existent directories.
++ if test "$hardcode_direct" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
++ test "$hardcode_minus_L" != no; then
++ # Linking always hardcodes the temporary library directory.
++ hardcode_action=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ hardcode_action=immediate
++ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
@@ -43700,11 +44160,7 @@ index e4c8adc..6d19a92 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
-- case $lt_echo in
-- *'\$0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-- ;;
-- esac
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+if test "$hardcode_action" = relink ||
+ test "$inherit_rpath" = yes; then
+ # Fast installation is not supported
@@ -43715,13 +44171,6 @@ index e4c8adc..6d19a92 100755
+ enable_fast_install=needless
+fi
--cfgfile="$ofile"
-
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
@@ -43730,6 +44179,15 @@ index e4c8adc..6d19a92 100755
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+ if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
@@ -43738,8 +44196,10 @@ index e4c8adc..6d19a92 100755
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_RC
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
@@ -43747,24 +44207,25 @@ index e4c8adc..6d19a92 100755
+ lt_cv_dlopen_self=yes
+ ;;
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ darwin*)
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
@@ -43777,10 +44238,8 @@ index e4c8adc..6d19a92 100755
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
+-# A C compiler.
+-LTCC=$lt_LTCC
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -43811,23 +44270,22 @@ index e4c8adc..6d19a92 100755
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# A language-specific compiler.
+-CC=$lt_compiler_RC
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_RC
+fi
--# A C compiler.
--LTCC=$lt_LTCC
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ ;;
--# A language-specific compiler.
--CC=$lt_compiler_RC
+-# The linker used to build libraries.
+-LD=$lt_LD_RC
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
@@ -43842,9 +44300,7 @@ index e4c8adc..6d19a92 100755
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_RC
++
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -43888,8 +44344,8 @@ index e4c8adc..6d19a92 100755
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -43929,8 +44385,8 @@ index e4c8adc..6d19a92 100755
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--# The linker used to build libraries.
--LD=$lt_LD_RC
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -43970,8 +44426,8 @@ index e4c8adc..6d19a92 100755
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -44002,13 +44458,6 @@ index e4c8adc..6d19a92 100755
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
--# A BSD-compatible nm program.
--NM=$lt_NM
-
--# A symbol stripping program
--STRIP=$lt_STRIP
-+fi
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
@@ -44040,37 +44489,44 @@ index e4c8adc..6d19a92 100755
-# Old archive suffix (normally "a").
-libext="$libext"
-+ ;;
-+ esac
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
++fi
+
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++ ;;
++ esac
+
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_RC
+-pic_mode=$pic_mode
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_RC
--pic_mode=$pic_mode
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ { $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; }
+if ${lt_cv_dlopen_self+:} false; then :
@@ -44085,18 +44541,18 @@ index e4c8adc..6d19a92 100755
+#line $LINENO "configure"
+#include "confdefs.h"
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# Do we need a version for libraries?
+-need_version=$need_version
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+#include <stdio.h>
--# Do we need a version for libraries?
--need_version=$need_version
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
@@ -44107,8 +44563,8 @@ index e4c8adc..6d19a92 100755
+# endif
+#endif
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
@@ -44131,24 +44587,24 @@ index e4c8adc..6d19a92 100755
+# endif
+#endif
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_RC
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+int fnord () { return 42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_RC
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -44162,8 +44618,8 @@ index e4c8adc..6d19a92 100755
+ else
+ puts (dlerror ());
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+ return status;
+}
+_LT_EOF
@@ -44186,17 +44642,17 @@ index e4c8adc..6d19a92 100755
+fi
+rm -fr conftest*
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+-# Library versioning type.
+-version_type=$version_type
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ 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
@@ -44213,19 +44669,22 @@ index e4c8adc..6d19a92 100755
+#line $LINENO "configure"
+#include "confdefs.h"
--# Library versioning type.
--version_type=$version_type
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+#include <stdio.h>
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_RC
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
@@ -44236,8 +44695,8 @@ index e4c8adc..6d19a92 100755
+# endif
+#endif
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
@@ -44260,27 +44719,28 @@ index e4c8adc..6d19a92 100755
+# endif
+#endif
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_RC
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_RC
+-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+int fnord () { return 42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_RC
+-module_expsym_cmds=$lt_module_expsym_cmds_RC
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -44294,11 +44754,9 @@ index e4c8adc..6d19a92 100755
+ else
+ puts (dlerror ());
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_RC
--archive_expsym_cmds=$lt_archive_expsym_cmds_RC
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+ return status;
+}
+_LT_EOF
@@ -44321,13 +44779,13 @@ index e4c8adc..6d19a92 100755
+fi
+rm -fr conftest*
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_RC
--module_expsym_cmds=$lt_module_expsym_cmds_RC
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_RC
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_RC
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
@@ -44335,7 +44793,7 @@ index e4c8adc..6d19a92 100755
-# Dependencies to place before the objects being linked to create a
-# shared library.
--predep_objects=$lt_predep_objects_RC
+-predeps=$lt_predeps_RC
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
@@ -44344,29 +44802,21 @@ index e4c8adc..6d19a92 100755
-# Dependencies to place after the objects being linked to create a
-# shared library.
--postdep_objects=$lt_postdep_objects_RC
+-postdeps=$lt_postdeps_RC
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_RC
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_RC
-
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
@@ -44412,6 +44862,14 @@ index e4c8adc..6d19a92 100755
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+-# 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_RC
+
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
@@ -44442,14 +44900,6 @@ index e4c8adc..6d19a92 100755
+ esac
+fi
--# 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_RC
-
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
@@ -44484,20 +44934,26 @@ index e4c8adc..6d19a92 100755
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
+
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ # Report which library types will actually be built
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_RC
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_RC
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_RC
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
@@ -44509,8 +44965,7 @@ index e4c8adc..6d19a92 100755
+ fi
+ ;;
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_RC
+-# ### END LIBTOOL TAG CONFIG: $tagname
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
@@ -44520,8 +44975,7 @@ index e4c8adc..6d19a92 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_RC
+-__EOF__
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
@@ -44529,10 +44983,6 @@ index e4c8adc..6d19a92 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
--# ### END LIBTOOL TAG CONFIG: $tagname
-
--__EOF__
-
-else
- # If there is no Makefile yet, we rely on a make rule to execute
@@ -44542,13 +44992,14 @@ index e4c8adc..6d19a92 100755
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
- fi
--
--
+-fi
+
+
++fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12055,57 +14002,36 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12055,47 +14042,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
@@ -44593,17 +45044,15 @@ index e4c8adc..6d19a92 100755
+ ac_config_commands="$ac_config_commands libtool"
++
++
++
++# Only expand once:
-+# Only expand once:
-+
-+
-+
- ol_link_perl=no
- if test $ol_enable_perl != no ; then
- # Extract the first word of "perl", so it can be a program name with args.
+@@ -12105,7 +14071,7 @@ if test $ol_enable_perl != no ; then
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -44612,7 +45061,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
case $PERLBIN in
-@@ -12145,7 +14071,7 @@ fi
+@@ -12119,7 +14085,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PERLBIN="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12145,7 +14111,7 @@ fi
if test "no$PERLBIN" = "no" ; then
if test $ol_enable_perl = yes ; then
@@ -44621,7 +45079,7 @@ index e4c8adc..6d19a92 100755
fi
else
-@@ -12173,7 +14099,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+@@ -12173,7 +14139,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
@@ -44630,7 +45088,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -12203,7 +14129,7 @@ else
+@@ -12203,7 +14169,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -44639,7 +45097,7 @@ index e4c8adc..6d19a92 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -12219,11 +14145,11 @@ else
+@@ -12219,11 +14185,11 @@ else
ac_preproc_ok=:
break
fi
@@ -44653,7 +45111,7 @@ index e4c8adc..6d19a92 100755
if $ac_preproc_ok; then :
break
fi
-@@ -12262,7 +14188,7 @@ else
+@@ -12262,7 +14228,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -44662,7 +45120,7 @@ index e4c8adc..6d19a92 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -12278,18 +14204,18 @@ else
+@@ -12278,18 +14244,18 @@ else
ac_preproc_ok=:
break
fi
@@ -44685,7 +45143,7 @@ index e4c8adc..6d19a92 100755
fi
ac_ext=c
-@@ -12300,7 +14226,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12300,7 +14266,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using MS Visual C++" >&5
$as_echo_n "checking whether we are using MS Visual C++... " >&6; }
@@ -44694,7 +45152,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12316,7 +14242,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -12316,7 +14282,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_msvc=no
fi
@@ -44703,7 +45161,7 @@ index e4c8adc..6d19a92 100755
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_msvc" >&5
$as_echo "$ol_cv_msvc" >&6; }
-@@ -12337,7 +14263,7 @@ _ACEOF
+@@ -12337,7 +14303,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for be_app in -lbe" >&5
$as_echo_n "checking for be_app in -lbe... " >&6; }
@@ -44712,7 +45170,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -12371,7 +14297,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -12371,7 +14337,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_be_be_app" >&5
$as_echo "$ac_cv_lib_be_be_app" >&6; }
@@ -44721,7 +45179,7 @@ index e4c8adc..6d19a92 100755
LIBS="$LIBS -lbe -lroot -lnet"
else
:
-@@ -12388,7 +14314,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -12388,7 +14354,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; }
@@ -44730,7 +45188,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12428,7 +14354,7 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -12400,7 +14366,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12428,7 +14394,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; }
@@ -44739,7 +45206,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12481,7 +14407,7 @@ if test -z "$CC"; then
+@@ -12440,7 +14406,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12481,7 +14447,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; }
@@ -44748,7 +45224,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12521,7 +14447,7 @@ if test -z "$CC"; then
+@@ -12493,7 +14459,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12521,7 +14487,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; }
@@ -44757,7 +45242,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12580,7 +14506,7 @@ if test -z "$CC"; then
+@@ -12534,7 +14500,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -12580,7 +14546,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; }
@@ -44766,7 +45260,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -12624,7 +14550,7 @@ do
+@@ -12592,7 +14558,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12624,7 +14590,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; }
@@ -44775,7 +45278,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -12678,8 +14604,8 @@ fi
+@@ -12636,7 +14602,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -12678,8 +14644,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;}
@@ -44786,7 +45298,7 @@ index e4c8adc..6d19a92 100755
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -12708,7 +14634,7 @@ done
+@@ -12708,7 +14674,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; }
@@ -44795,7 +45307,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12745,7 +14671,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+@@ -12745,7 +14711,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; }
@@ -44804,7 +45316,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -12823,7 +14749,7 @@ else
+@@ -12823,7 +14789,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; }
@@ -44813,7 +45325,17 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -12922,7 +14848,7 @@ depcc="$CC" am_compiler_list=
+@@ -12832,8 +14798,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -12922,15 +14887,16 @@ 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; }
@@ -44822,15 +45344,18 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12931,6 +14857,7 @@ else
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
++ # 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.
-@@ -12948,6 +14875,11 @@ else
+@@ -12948,6 +14914,11 @@ else
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -44842,14 +45367,23 @@ index e4c8adc..6d19a92 100755
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
-@@ -12965,7 +14897,17 @@ else
+@@ -12959,34 +14930,49 @@ else
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++ # Solaris 10 /bin/sh.
++ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs
++ # handle '-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
@@ -44858,14 +45392,18 @@ index e4c8adc..6d19a92 100755
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
-@@ -12975,18 +14917,23 @@ else
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
++ # After this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
break
fi
;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-+ # This compiler won't grok `-c -o', but also, the minuso test has
++ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
@@ -44890,7 +45428,7 @@ index e4c8adc..6d19a92 100755
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
-@@ -13014,9 +14961,7 @@ fi
+@@ -13014,9 +15000,7 @@ fi
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -44901,7 +45439,7 @@ index e4c8adc..6d19a92 100755
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -13028,7 +14973,7 @@ fi
+@@ -13028,7 +15012,7 @@ fi
if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then
@@ -44910,7 +45448,7 @@ index e4c8adc..6d19a92 100755
fi
# test for make depend flag
-@@ -13039,7 +14984,7 @@ if test -z "${MKDEP}"; then
+@@ -13039,7 +15023,7 @@ if test -z "${MKDEP}"; then
if test -z "${MKDEP_FLAGS}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${OL_MKDEP} depend flag" >&5
$as_echo_n "checking for ${OL_MKDEP} depend flag... " >&6; }
@@ -44919,7 +45457,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -13089,7 +15034,7 @@ fi
+@@ -13089,7 +15073,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for afopen in -ls" >&5
$as_echo_n "checking for afopen in -ls... " >&6; }
@@ -44928,7 +45466,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13123,7 +15068,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13123,7 +15107,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_s_afopen" >&5
$as_echo "$ac_cv_lib_s_afopen" >&6; }
@@ -44937,7 +45475,7 @@ index e4c8adc..6d19a92 100755
AUTH_LIBS=-ls
-@@ -13148,7 +15093,7 @@ if test $ol_enable_modules != no ; then
+@@ -13148,7 +15132,7 @@ if test $ol_enable_modules != no ; then
for ac_header in ltdl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
@@ -44946,7 +45484,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LTDL_H 1
_ACEOF
-@@ -13159,12 +15104,12 @@ done
+@@ -13159,12 +15143,12 @@ done
if test $ac_cv_header_ltdl_h = no ; then
@@ -44961,7 +45499,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13198,7 +15143,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13198,7 +15182,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
@@ -44970,7 +45508,7 @@ index e4c8adc..6d19a92 100755
MODULES_LIBS=-lltdl
-@@ -13209,7 +15154,7 @@ fi
+@@ -13209,7 +15193,7 @@ fi
if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
@@ -44979,7 +45517,7 @@ index e4c8adc..6d19a92 100755
fi
ol_link_modules=yes
WITH_MODULES_ENABLED=yes
-@@ -13236,7 +15181,7 @@ fi
+@@ -13236,7 +15220,7 @@ fi
# test for EBCDIC
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EBCDIC" >&5
$as_echo_n "checking for EBCDIC... " >&6; }
@@ -44988,7 +45526,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -13253,7 +15198,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -13253,7 +15237,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_cpp_ebcdic=no
fi
@@ -44997,7 +45535,7 @@ index e4c8adc..6d19a92 100755
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_cpp_ebcdic" >&5
$as_echo "$ol_cv_cpp_ebcdic" >&6; }
-@@ -13265,7 +15210,7 @@ fi
+@@ -13265,7 +15249,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -45006,7 +45544,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13280,7 +15225,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -13280,7 +15264,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_header_stdc=no
fi
@@ -45015,7 +45553,7 @@ index e4c8adc..6d19a92 100755
if test $ol_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -13369,7 +15314,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+@@ -13369,7 +15353,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
@@ -45024,7 +45562,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13396,8 +15341,7 @@ fi
+@@ -13396,8 +15380,7 @@ fi
eval ac_res=\$$as_ac_Header
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -45034,7 +45572,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
-@@ -13410,7 +15354,7 @@ done
+@@ -13410,7 +15393,7 @@ done
if test $ac_header_dirent = dirent.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
@@ -45043,7 +45581,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -13444,11 +15388,11 @@ for ac_lib in '' dir; do
+@@ -13444,11 +15427,11 @@ for ac_lib in '' dir; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45057,7 +45595,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_opendir=no
-@@ -13467,7 +15411,7 @@ fi
+@@ -13467,7 +15450,7 @@ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
@@ -45066,7 +45604,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -13501,11 +15445,11 @@ for ac_lib in '' x; do
+@@ -13501,11 +15484,11 @@ for ac_lib in '' x; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45080,7 +45618,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_opendir=no
-@@ -13525,7 +15469,7 @@ fi
+@@ -13525,7 +15508,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
@@ -45089,7 +45627,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13566,7 +15510,7 @@ fi
+@@ -13566,7 +15549,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
@@ -45098,7 +45636,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13593,7 +15537,7 @@ $as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+@@ -13593,7 +15576,7 @@ $as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
@@ -45107,7 +45645,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13677,8 +15621,7 @@ for ac_header in \
+@@ -13677,8 +15660,7 @@ for ac_header in \
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45117,7 +45655,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -13696,8 +15639,7 @@ then
+@@ -13696,8 +15678,7 @@ then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45127,7 +45665,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -13714,7 +15656,7 @@ do :
+@@ -13714,7 +15695,7 @@ do :
#include <netinet/in.h>
"
@@ -45136,7 +45674,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_RESOLV_H 1
_ACEOF
-@@ -13730,7 +15672,7 @@ do :
+@@ -13730,7 +15711,7 @@ do :
#include <netinet/in.h>
"
@@ -45145,7 +45683,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_NETINET_TCP_H 1
_ACEOF
-@@ -13748,7 +15690,7 @@ do :
+@@ -13748,7 +15729,7 @@ do :
#endif
"
@@ -45154,7 +45692,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_UCRED_H 1
_ACEOF
-@@ -13763,8 +15705,7 @@ for ac_func in sigaction sigset
+@@ -13763,8 +15744,7 @@ for ac_func in sigaction sigset
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -45164,7 +45702,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -13776,7 +15717,7 @@ done
+@@ -13776,7 +15756,7 @@ done
if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigset in -lV3" >&5
$as_echo_n "checking for sigset in -lV3... " >&6; }
@@ -45173,7 +45711,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13810,7 +15751,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13810,7 +15790,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_V3_sigset" >&5
$as_echo "$ac_cv_lib_V3_sigset" >&6; }
@@ -45182,7 +45720,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBV3 1
_ACEOF
-@@ -13828,7 +15769,7 @@ fi
+@@ -13828,7 +15808,7 @@ fi
if test "$ac_cv_header_winsock_h" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for winsock" >&5
$as_echo_n "checking for winsock... " >&6; }
@@ -45191,7 +45729,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -13893,13 +15834,13 @@ fi
+@@ -13893,13 +15873,13 @@ fi
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
@@ -45207,7 +45745,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13927,7 +15868,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13927,7 +15907,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
$as_echo "$ac_cv_lib_socket_main" >&6; }
@@ -45216,7 +45754,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
-@@ -13938,7 +15879,7 @@ fi
+@@ -13938,7 +15918,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnet" >&5
$as_echo_n "checking for socket in -lnet... " >&6; }
@@ -45225,7 +45763,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13972,7 +15913,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13972,7 +15952,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_socket" >&5
$as_echo "$ac_cv_lib_net_socket" >&6; }
@@ -45234,7 +45772,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNET 1
_ACEOF
-@@ -13983,7 +15924,7 @@ fi
+@@ -13983,7 +15963,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl_s" >&5
$as_echo_n "checking for main in -lnsl_s... " >&6; }
@@ -45243,7 +45781,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14011,7 +15952,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14011,7 +15991,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_s_main" >&5
$as_echo "$ac_cv_lib_nsl_s_main" >&6; }
@@ -45252,7 +45790,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL_S 1
_ACEOF
-@@ -14022,7 +15963,7 @@ fi
+@@ -14022,7 +16002,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5
$as_echo_n "checking for main in -lnsl... " >&6; }
@@ -45261,7 +45799,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14050,7 +15991,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14050,7 +16030,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5
$as_echo "$ac_cv_lib_nsl_main" >&6; }
@@ -45270,7 +45808,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
-@@ -14061,7 +16002,7 @@ fi
+@@ -14061,7 +16041,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -linet" >&5
$as_echo_n "checking for socket in -linet... " >&6; }
@@ -45279,7 +45817,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14095,7 +16036,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14095,7 +16075,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_socket" >&5
$as_echo "$ac_cv_lib_inet_socket" >&6; }
@@ -45288,7 +45826,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINET 1
_ACEOF
-@@ -14106,7 +16047,7 @@ fi
+@@ -14106,7 +16086,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgen" >&5
$as_echo_n "checking for main in -lgen... " >&6; }
@@ -45297,7 +45835,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -14134,7 +16075,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -14134,7 +16114,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_main" >&5
$as_echo "$ac_cv_lib_gen_main" >&6; }
@@ -45306,7 +45844,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEN 1
_ACEOF
-@@ -14148,10 +16089,10 @@ fi
+@@ -14148,10 +16128,10 @@ fi
ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
@@ -45319,7 +45857,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -14160,8 +16101,7 @@ if test "${ac_cv_header_winsock_h}" != yes; then
+@@ -14160,8 +16140,7 @@ if test "${ac_cv_header_winsock_h}" != yes; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45329,7 +45867,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -14172,7 +16112,7 @@ done
+@@ -14172,7 +16151,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
$as_echo_n "checking types of arguments for select... " >&6; }
@@ -45338,7 +45876,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
-@@ -14206,7 +16146,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -14206,7 +16185,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
done
# Provide a safe default value.
@@ -45347,7 +45885,7 @@ index e4c8adc..6d19a92 100755
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
-@@ -14239,8 +16179,7 @@ for ac_func in poll
+@@ -14239,8 +16218,7 @@ for ac_func in poll
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -45357,7 +45895,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -14253,8 +16192,7 @@ for ac_header in poll.h sys/poll.h
+@@ -14253,8 +16231,7 @@ for ac_header in poll.h sys/poll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45367,7 +45905,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -14269,8 +16207,7 @@ for ac_header in sys/epoll.h
+@@ -14269,8 +16246,7 @@ for ac_header in sys/epoll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45377,7 +45915,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -14314,8 +16251,7 @@ for ac_header in sys/devpoll.h
+@@ -14314,8 +16290,7 @@ for ac_header in sys/devpoll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45387,7 +45925,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -14359,7 +16295,7 @@ fi
+@@ -14359,7 +16334,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking declaration of sys_errlist" >&5
$as_echo_n "checking declaration of sys_errlist... " >&6; }
@@ -45396,7 +45934,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14399,7 +16335,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
+@@ -14399,7 +16374,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existence of sys_errlist" >&5
$as_echo_n "checking existence of sys_errlist... " >&6; }
@@ -45405,7 +45943,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14434,8 +16370,7 @@ fi
+@@ -14434,8 +16409,7 @@ fi
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -45415,7 +45953,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -14447,7 +16382,7 @@ ol_cv_func_strerror_r=no
+@@ -14447,7 +16421,7 @@ ol_cv_func_strerror_r=no
if test "${ac_cv_func_strerror_r}" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking non-posix strerror_r" >&5
$as_echo_n "checking non-posix strerror_r... " >&6; }
@@ -45424,7 +45962,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14523,7 +16458,7 @@ fi
+@@ -14523,7 +16497,7 @@ fi
elif test "${ac_cv_func_strerror}" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking declaration of sys_errlist" >&5
$as_echo_n "checking declaration of sys_errlist... " >&6; }
@@ -45433,7 +45971,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14563,7 +16498,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
+@@ -14563,7 +16537,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existence of sys_errlist" >&5
$as_echo_n "checking existence of sys_errlist... " >&6; }
@@ -45442,7 +45980,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14606,7 +16541,7 @@ do :
+@@ -14606,7 +16580,7 @@ do :
#endif
"
@@ -45451,7 +45989,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_REGEX_H 1
_ACEOF
-@@ -14617,11 +16552,11 @@ done
+@@ -14617,11 +16591,11 @@ done
if test "$ac_cv_header_regex_h" != yes ; then
@@ -45465,7 +46003,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -14655,11 +16590,11 @@ for ac_lib in '' regex gnuregex; do
+@@ -14655,11 +16629,11 @@ for ac_lib in '' regex gnuregex; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45479,7 +46017,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_regfree=no
-@@ -14674,14 +16609,14 @@ if test "$ac_res" != no; then :
+@@ -14674,14 +16648,14 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
:
else
@@ -45496,7 +46034,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -14728,7 +16663,7 @@ fi
+@@ -14728,7 +16702,7 @@ fi
$as_echo "$ol_cv_c_posix_regex" >&6; }
if test "$ol_cv_c_posix_regex" = no ; then
@@ -45505,7 +46043,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -14736,7 +16671,7 @@ have_uuid=no
+@@ -14736,7 +16710,7 @@ have_uuid=no
for ac_header in sys/uuid.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/uuid.h" "ac_cv_header_sys_uuid_h" "$ac_includes_default"
@@ -45514,7 +46052,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_UUID_H 1
_ACEOF
-@@ -14749,7 +16684,7 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
+@@ -14749,7 +16723,7 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
save_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_to_str" >&5
$as_echo_n "checking for library containing uuid_to_str... " >&6; }
@@ -45523,7 +46061,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -14783,11 +16718,11 @@ for ac_lib in '' uuid; do
+@@ -14783,11 +16757,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45537,7 +46075,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_uuid_to_str=no
-@@ -14807,7 +16742,7 @@ fi
+@@ -14807,7 +16781,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
$as_echo_n "checking for library containing uuid_create... " >&6; }
@@ -45546,7 +46084,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -14841,11 +16776,11 @@ for ac_lib in '' uuid; do
+@@ -14841,11 +16815,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45560,7 +46098,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_uuid_create=no
-@@ -14879,7 +16814,7 @@ if test $have_uuid = no ; then
+@@ -14879,7 +16853,7 @@ if test $have_uuid = no ; then
for ac_header in uuid/uuid.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
@@ -45569,7 +46107,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_UUID_UUID_H 1
_ACEOF
-@@ -14892,7 +16827,7 @@ done
+@@ -14892,7 +16866,7 @@ done
save_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
$as_echo_n "checking for library containing uuid_generate... " >&6; }
@@ -45578,7 +46116,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -14926,11 +16861,11 @@ for ac_lib in '' uuid; do
+@@ -14926,11 +16900,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45592,7 +46130,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_uuid_generate=no
-@@ -14950,7 +16885,7 @@ fi
+@@ -14950,7 +16924,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_unparse_lower" >&5
$as_echo_n "checking for library containing uuid_unparse_lower... " >&6; }
@@ -45601,7 +46139,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-@@ -14984,11 +16919,11 @@ for ac_lib in '' uuid; do
+@@ -14984,11 +16958,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
@@ -45615,7 +46153,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_search_uuid_unparse_lower=no
-@@ -15060,7 +16995,7 @@ ol_cv_lib_resolver=no
+@@ -15060,7 +17034,7 @@ ol_cv_lib_resolver=no
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (default)" >&5
$as_echo_n "checking for resolver link (default)... " >&6; }
@@ -45624,7 +46162,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15141,7 +17076,7 @@ fi
+@@ -15141,7 +17115,7 @@ fi
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (-lresolv)" >&5
$as_echo_n "checking for resolver link (-lresolv)... " >&6; }
@@ -45633,7 +46171,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15222,7 +17157,7 @@ fi
+@@ -15222,7 +17196,7 @@ fi
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (-lbind)" >&5
$as_echo_n "checking for resolver link (-lbind)... " >&6; }
@@ -45642,7 +46180,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15319,7 +17254,7 @@ fi
+@@ -15319,7 +17293,7 @@ fi
if test "$ol_enable_dnssrv" = yes || test "$ol_enable_dnssrv" = mod ; then
if test "$ol_link_dnssrv" = no ; then
@@ -45651,7 +46189,7 @@ index e4c8adc..6d19a92 100755
fi
else
ol_enable_dnssrv=no
-@@ -15329,8 +17264,7 @@ for ac_func in hstrerror
+@@ -15329,8 +17303,7 @@ for ac_func in hstrerror
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -45661,7 +46199,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15343,8 +17277,7 @@ for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop
+@@ -15343,8 +17316,7 @@ for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -45671,7 +46209,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15356,12 +17289,12 @@ done
+@@ -15356,12 +17328,12 @@ done
ol_link_ipv6=no
if test $ac_cv_func_getaddrinfo = no || test $ac_cv_func_inet_ntop = no ; then
if test $ol_enable_ipv6 = yes ; then
@@ -45686,7 +46224,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15389,7 +17322,7 @@ $as_echo "$ol_cv_inet6_addrstrlen" >&6; }
+@@ -15389,7 +17361,7 @@ $as_echo "$ol_cv_inet6_addrstrlen" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sockaddr_storage" >&5
$as_echo_n "checking struct sockaddr_storage... " >&6; }
@@ -45695,7 +46233,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15424,10 +17357,10 @@ $as_echo "$ol_cv_struct_sockaddr_storage" >&6; }
+@@ -15424,10 +17396,10 @@ $as_echo "$ol_cv_struct_sockaddr_storage" >&6; }
ol_link_ipv6=yes
elif test $ol_enable_ipv6 = yes &&
test $ol_cv_inet6_addrstrlen = no ; then
@@ -45708,7 +46246,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -15436,8 +17369,7 @@ if test $ol_enable_local != no ; then
+@@ -15436,8 +17408,7 @@ if test $ol_enable_local != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -45718,7 +46256,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -15450,7 +17382,7 @@ done
+@@ -15450,7 +17421,7 @@ done
if test $ol_enable_local = auto ; then
ol_enable_local=$ac_cv_header_sys_un_h
elif test $ac_cv_header_sys_un_h = no ; then
@@ -45727,7 +46265,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -15464,7 +17396,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
+@@ -15464,7 +17435,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
for ac_header in openssl/ssl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
@@ -45736,7 +46274,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_SSL_H 1
_ACEOF
-@@ -15477,7 +17409,7 @@ done
+@@ -15477,7 +17448,7 @@ done
if test $ac_cv_header_openssl_ssl_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
@@ -45745,7 +46283,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15511,7 +17443,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -15511,7 +17482,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
@@ -45754,7 +46292,7 @@ index e4c8adc..6d19a92 100755
have_openssl=yes
need_rsaref=no
else
-@@ -15522,7 +17454,7 @@ fi
+@@ -15522,7 +17493,7 @@ fi
if test $have_openssl = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssl3_accept in -lssl" >&5
$as_echo_n "checking for ssl3_accept in -lssl... " >&6; }
@@ -45763,7 +46301,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15556,7 +17488,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -15556,7 +17527,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_ssl3_accept" >&5
$as_echo "$ac_cv_lib_ssl_ssl3_accept" >&6; }
@@ -45772,7 +46310,7 @@ index e4c8adc..6d19a92 100755
have_openssl=yes
need_rsaref=yes
else
-@@ -15585,7 +17517,7 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
+@@ -15585,7 +17556,7 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version (CRL checking capability)" >&5
$as_echo_n "checking OpenSSL library version (CRL checking capability)... " >&6; }
@@ -45781,7 +46319,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15628,7 +17560,7 @@ if test $ol_link_tls = no ; then
+@@ -15628,7 +17599,7 @@ if test $ol_link_tls = no ; then
for ac_header in gnutls/gnutls.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
@@ -45790,7 +46328,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_GNUTLS_GNUTLS_H 1
_ACEOF
-@@ -15641,7 +17573,7 @@ done
+@@ -15641,7 +17612,7 @@ done
if test $ac_cv_header_gnutls_gnutls_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
$as_echo_n "checking for gnutls_init in -lgnutls... " >&6; }
@@ -45799,7 +46337,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -15675,7 +17607,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -15675,7 +17646,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_init" >&5
$as_echo "$ac_cv_lib_gnutls_gnutls_init" >&6; }
@@ -45808,19 +46346,22 @@ index e4c8adc..6d19a92 100755
have_gnutls=yes
else
have_gnutls=no
-@@ -15698,75 +17630,203 @@ fi
+@@ -15689,84 +17660,215 @@ fi
+ TLS_LIBS="-lgnutls"
- if test $ol_link_tls = no ; then
- if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
-- have_moznss=no
-- for ac_header in nssutil.h
--do :
-- ac_fn_c_check_header_mongrel "$LINENO" "nssutil.h" "ac_cv_header_nssutil_h" "$ac_includes_default"
--if test "x$ac_cv_header_nssutil_h" = x""yes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_NSSUTIL_H 1
--_ACEOF
+-$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
++$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
++
++ fi
++ fi
++ fi
++fi
++
++if test $ol_link_tls = no ; then
++ if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
++
++
+
+
+
@@ -45846,7 +46387,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -45889,7 +46430,7 @@ index e4c8adc..6d19a92 100755
+ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
@@ -45924,7 +46465,9 @@ index e4c8adc..6d19a92 100755
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
-+
+
+- fi
+- fi
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
@@ -45937,13 +46480,23 @@ index e4c8adc..6d19a92 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
-+ fi
-+fi
-+
+ fi
+ fi
+
+-if test $ol_link_tls = no ; then
+- if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
+- have_moznss=no
+- for ac_header in nssutil.h
+-do :
+- ac_fn_c_check_header_mongrel "$LINENO" "nssutil.h" "ac_cv_header_nssutil_h" "$ac_includes_default"
+-if test "x$ac_cv_header_nssutil_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_NSSUTIL_H 1
+-_ACEOF
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZNSS" >&5
+$as_echo_n "checking for MOZNSS... " >&6; }
-+
+
+if test -n "$MOZNSS_CFLAGS"; then
+ pkg_cv_MOZNSS_CFLAGS="$MOZNSS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
@@ -45954,6 +46507,7 @@ index e4c8adc..6d19a92 100755
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZNSS_CFLAGS=`$PKG_CONFIG --cflags "nss nspr" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
@@ -45970,6 +46524,7 @@ index e4c8adc..6d19a92 100755
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOZNSS_LIBS=`$PKG_CONFIG --libs "nss nspr" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
@@ -46015,20 +46570,20 @@ index e4c8adc..6d19a92 100755
+ _pkg_short_errors_supported=yes
else
- ac_cv_lib_nss3_NSS_Initialize=no
--fi
++ _pkg_short_errors_supported=no
+ fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+ _pkg_short_errors_supported=no
- fi
+-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_NSS_Initialize" >&5
-$as_echo "$ac_cv_lib_nss3_NSS_Initialize" >&6; }
-if test "x$ac_cv_lib_nss3_NSS_Initialize" = x""yes; then :
- have_moznss=yes
+ if test $_pkg_short_errors_supported = yes; then
-+ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss nspr" 2>&1`
++ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss nspr" 2>&1`
+ else
-+ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss nspr" 2>&1`
++ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss nspr" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZNSS_PKG_ERRORS" >&5
@@ -46066,7 +46621,7 @@ index e4c8adc..6d19a92 100755
fi
fi
fi
-@@ -15783,7 +17843,7 @@ $as_echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;}
+@@ -15783,7 +17885,7 @@ $as_echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS data protection not supported!" >&5
$as_echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
elif test $ol_with_tls != no ; then
@@ -46075,7 +46630,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS data protection not supported!" >&5
$as_echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
-@@ -15791,7 +17851,7 @@ fi
+@@ -15791,7 +17893,7 @@ fi
if test $ol_enable_lmpasswd != no; then
if test $ol_link_tls != yes ; then
@@ -46084,7 +46639,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -15805,7 +17865,7 @@ case $ol_with_threads in auto | yes | nt)
+@@ -15805,7 +17907,7 @@ case $ol_with_threads in auto | yes | nt)
ac_fn_c_check_func "$LINENO" "_beginthread" "ac_cv_func__beginthread"
@@ -46093,7 +46648,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -15832,7 +17892,7 @@ $as_echo "#define HAVE_NT_EVENT_LOG 1" >>confdefs.h
+@@ -15832,7 +17934,7 @@ $as_echo "#define HAVE_NT_EVENT_LOG 1" >>confdefs.h
fi
if test $ol_with_threads = nt ; then
@@ -46102,7 +46657,7 @@ index e4c8adc..6d19a92 100755
fi
;;
esac
-@@ -15842,7 +17902,7 @@ case $ol_with_threads in auto | yes | posix)
+@@ -15842,7 +17944,7 @@ case $ol_with_threads in auto | yes | posix)
for ac_header in pthread.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
@@ -46111,7 +46666,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_H 1
_ACEOF
-@@ -15855,7 +17915,7 @@ done
+@@ -15855,7 +17957,7 @@ done
if test $ac_cv_header_pthread_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking POSIX thread version" >&5
$as_echo_n "checking POSIX thread version... " >&6; }
@@ -46120,7 +46675,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -15953,7 +18013,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -15953,7 +18055,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
else
@@ -46129,7 +46684,7 @@ index e4c8adc..6d19a92 100755
fi
# consider threads found
-@@ -15962,7 +18022,7 @@ _ACEOF
+@@ -15962,7 +18064,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5
$as_echo_n "checking for LinuxThreads pthread.h... " >&6; }
@@ -46138,7 +46693,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15990,7 +18050,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
+@@ -15990,7 +18092,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Pth pthread.h" >&5
$as_echo_n "checking for GNU Pth pthread.h... " >&6; }
@@ -46147,7 +46702,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -16019,7 +18079,7 @@ $as_echo "$ol_cv_header_gnu_pth_pthread_h" >&6; }
+@@ -16019,7 +18121,7 @@ $as_echo "$ol_cv_header_gnu_pth_pthread_h" >&6; }
for ac_header in sched.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default"
@@ -46156,7 +46711,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_SCHED_H 1
_ACEOF
-@@ -16033,7 +18093,7 @@ done
+@@ -16033,7 +18135,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in default libraries" >&5
$as_echo_n "checking for pthread_create in default libraries... " >&6; }
@@ -46165,7 +46720,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -16214,7 +18274,7 @@ if test "$ol_link_threads" = no ; then
+@@ -16214,7 +18316,7 @@ if test "$ol_link_threads" = no ; then
# try -kthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -kthread" >&5
$as_echo_n "checking for pthread link with -kthread... " >&6; }
@@ -46174,7 +46729,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -16404,7 +18464,7 @@ if test "$ol_link_threads" = no ; then
+@@ -16404,7 +18506,7 @@ if test "$ol_link_threads" = no ; then
# try -pthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -pthread" >&5
$as_echo_n "checking for pthread link with -pthread... " >&6; }
@@ -46183,7 +46738,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -16594,7 +18654,7 @@ if test "$ol_link_threads" = no ; then
+@@ -16594,7 +18696,7 @@ if test "$ol_link_threads" = no ; then
# try -pthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -pthreads" >&5
$as_echo_n "checking for pthread link with -pthreads... " >&6; }
@@ -46192,7 +46747,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -16784,7 +18844,7 @@ if test "$ol_link_threads" = no ; then
+@@ -16784,7 +18886,7 @@ if test "$ol_link_threads" = no ; then
# try -mthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -mthreads" >&5
$as_echo_n "checking for pthread link with -mthreads... " >&6; }
@@ -46201,7 +46756,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -16974,7 +19034,7 @@ if test "$ol_link_threads" = no ; then
+@@ -16974,7 +19076,7 @@ if test "$ol_link_threads" = no ; then
# try -thread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -thread" >&5
$as_echo_n "checking for pthread link with -thread... " >&6; }
@@ -46210,7 +46765,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -17165,7 +19225,7 @@ if test "$ol_link_threads" = no ; then
+@@ -17165,7 +19267,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5
$as_echo_n "checking for pthread link with -lpthread -lmach -lexc -lc_r... " >&6; }
@@ -46219,7 +46774,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -17355,7 +19415,7 @@ if test "$ol_link_threads" = no ; then
+@@ -17355,7 +19457,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -lmach -lexc" >&5
$as_echo_n "checking for pthread link with -lpthread -lmach -lexc... " >&6; }
@@ -46228,7 +46783,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -17546,7 +19606,7 @@ if test "$ol_link_threads" = no ; then
+@@ -17546,7 +19648,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -Wl,-woff,85
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -Wl,-woff,85" >&5
$as_echo_n "checking for pthread link with -lpthread -Wl,-woff,85... " >&6; }
@@ -46237,7 +46792,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -17737,7 +19797,7 @@ if test "$ol_link_threads" = no ; then
+@@ -17737,7 +19839,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread" >&5
$as_echo_n "checking for pthread link with -lpthread... " >&6; }
@@ -46246,7 +46801,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -17927,7 +19987,7 @@ if test "$ol_link_threads" = no ; then
+@@ -17927,7 +20029,7 @@ if test "$ol_link_threads" = no ; then
# try -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lc_r" >&5
$as_echo_n "checking for pthread link with -lc_r... " >&6; }
@@ -46255,7 +46810,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -18118,7 +20178,7 @@ if test "$ol_link_threads" = no ; then
+@@ -18118,7 +20220,7 @@ if test "$ol_link_threads" = no ; then
# try -threads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -threads" >&5
$as_echo_n "checking for pthread link with -threads... " >&6; }
@@ -46264,7 +46819,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -18309,7 +20369,7 @@ if test "$ol_link_threads" = no ; then
+@@ -18309,7 +20411,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5
$as_echo_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r... " >&6; }
@@ -46273,7 +46828,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -18499,7 +20559,7 @@ if test "$ol_link_threads" = no ; then
+@@ -18499,7 +20601,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lmach -lexc" >&5
$as_echo_n "checking for pthread link with -lpthreads -lmach -lexc... " >&6; }
@@ -46282,7 +46837,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -18689,7 +20749,7 @@ if test "$ol_link_threads" = no ; then
+@@ -18689,7 +20791,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lexc" >&5
$as_echo_n "checking for pthread link with -lpthreads -lexc... " >&6; }
@@ -46291,7 +46846,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -18880,7 +20940,7 @@ if test "$ol_link_threads" = no ; then
+@@ -18880,7 +20982,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads" >&5
$as_echo_n "checking for pthread link with -lpthreads... " >&6; }
@@ -46300,7 +46855,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19077,8 +21137,7 @@ fi
+@@ -19077,8 +21179,7 @@ fi
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -46310,7 +46865,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19092,7 +21151,7 @@ done
+@@ -19092,7 +21193,7 @@ done
test $ac_cv_func_thr_yield = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
$as_echo_n "checking for sched_yield in -lrt... " >&6; }
@@ -46319,7 +46874,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -19126,7 +21185,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19126,7 +21227,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
$as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
@@ -46328,7 +46883,7 @@ index e4c8adc..6d19a92 100755
LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
$as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
-@@ -19147,7 +21206,7 @@ $as_echo "$as_me: WARNING: could not locate sched_yield() or pthread_yield()" >&
+@@ -19147,7 +21248,7 @@ $as_echo "$as_me: WARNING: could not locate sched_yield() or pthread_yield()" >&
for ac_func in pthread_kill
do :
ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
@@ -46337,7 +46892,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_KILL 1
_ACEOF
-@@ -19158,7 +21217,7 @@ done
+@@ -19158,7 +21259,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_destroy with <pthread.h>" >&5
$as_echo_n "checking for pthread_rwlock_destroy with <pthread.h>... " >&6; }
@@ -46346,7 +46901,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19195,7 +21254,7 @@ $as_echo "#define HAVE_PTHREAD_RWLOCK_DESTROY 1" >>confdefs.h
+@@ -19195,7 +21296,7 @@ $as_echo "#define HAVE_PTHREAD_RWLOCK_DESTROY 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_detach with <pthread.h>" >&5
$as_echo_n "checking for pthread_detach with <pthread.h>... " >&6; }
@@ -46355,7 +46910,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19228,7 +21287,7 @@ fi
+@@ -19228,7 +21329,7 @@ fi
$as_echo "$ol_cv_func_pthread_detach" >&6; }
if test $ol_cv_func_pthread_detach = no ; then
@@ -46364,7 +46919,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -19244,8 +21303,7 @@ $as_echo "#define HAVE_PTHREAD_DETACH 1" >>confdefs.h
+@@ -19244,8 +21345,7 @@ $as_echo "#define HAVE_PTHREAD_DETACH 1" >>confdefs.h
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -46374,7 +46929,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19258,7 +21316,7 @@ done
+@@ -19258,7 +21358,7 @@ done
for ac_func in pthread_kill_other_threads_np
do :
ac_fn_c_check_func "$LINENO" "pthread_kill_other_threads_np" "ac_cv_func_pthread_kill_other_threads_np"
@@ -46383,7 +46938,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_KILL_OTHER_THREADS_NP 1
_ACEOF
-@@ -19268,7 +21326,7 @@ done
+@@ -19268,7 +21368,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads implementation" >&5
$as_echo_n "checking for LinuxThreads implementation... " >&6; }
@@ -46392,7 +46947,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np
-@@ -19281,7 +21339,7 @@ $as_echo "$ol_cv_sys_linux_threads" >&6; }
+@@ -19281,7 +21381,7 @@ $as_echo "$ol_cv_sys_linux_threads" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads consistency" >&5
$as_echo_n "checking for LinuxThreads consistency... " >&6; }
@@ -46401,7 +46956,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19301,12 +21359,12 @@ $as_echo "$ol_cv_linux_threads" >&6; }
+@@ -19301,12 +21401,12 @@ $as_echo "$ol_cv_linux_threads" >&6; }
if test $ol_cv_linux_threads = error; then
@@ -46416,7 +46971,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19400,7 +21458,7 @@ fi
+@@ -19400,7 +21500,7 @@ fi
$as_echo "$ol_cv_pthread_create_works" >&6; }
if test $ol_cv_pthread_create_works = no ; then
@@ -46425,7 +46980,7 @@ index e4c8adc..6d19a92 100755
fi
ol_replace_broken_yield=no
-@@ -19414,7 +21472,7 @@ $as_echo "#define REPLACE_BROKEN_YIELD 1" >>confdefs.h
+@@ -19414,7 +21514,7 @@ $as_echo "#define REPLACE_BROKEN_YIELD 1" >>confdefs.h
if test $ol_with_yielding_select = auto ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if select yields when using pthreads" >&5
$as_echo_n "checking if select yields when using pthreads... " >&6; }
@@ -46434,7 +46989,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19512,7 +21570,7 @@ fi
+@@ -19512,7 +21612,7 @@ fi
$as_echo "$ol_cv_pthread_select_yields" >&6; }
if test $ol_cv_pthread_select_yields = cross ; then
@@ -46443,7 +46998,7 @@ index e4c8adc..6d19a92 100755
fi
if test $ol_cv_pthread_select_yields = yes ; then
-@@ -19523,12 +21581,12 @@ $as_echo "$ol_cv_pthread_select_yields" >&6; }
+@@ -19523,12 +21623,12 @@ $as_echo "$ol_cv_pthread_select_yields" >&6; }
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
else
@@ -46458,7 +47013,7 @@ index e4c8adc..6d19a92 100755
fi
;;
esac
-@@ -19539,8 +21597,7 @@ case $ol_with_threads in auto | yes | mach)
+@@ -19539,8 +21639,7 @@ case $ol_with_threads in auto | yes | mach)
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -46468,7 +47023,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -19553,7 +21610,7 @@ done
+@@ -19553,7 +21652,7 @@ done
ol_with_threads=found
ac_fn_c_check_func "$LINENO" "cthread_fork" "ac_cv_func_cthread_fork"
@@ -46477,7 +47032,7 @@ index e4c8adc..6d19a92 100755
ol_link_threads=yes
fi
-@@ -19561,7 +21618,7 @@ fi
+@@ -19561,7 +21660,7 @@ fi
if test $ol_link_threads = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cthread_fork with -all_load" >&5
$as_echo_n "checking for cthread_fork with -all_load... " >&6; }
@@ -46486,7 +47041,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19607,7 +21664,7 @@ $as_echo "$ol_cv_cthread_all_load" >&6; }
+@@ -19607,7 +21706,7 @@ $as_echo "$ol_cv_cthread_all_load" >&6; }
save_LIBS="$LIBS"
LIBS="$LIBS -lthreads"
ac_fn_c_check_func "$LINENO" "cthread_fork" "ac_cv_func_cthread_fork"
@@ -46495,7 +47050,7 @@ index e4c8adc..6d19a92 100755
ol_link_threads=yes
fi
-@@ -19618,11 +21675,11 @@ fi
+@@ -19618,11 +21717,11 @@ fi
ol_link_threads=mach
ol_with_threads=found
else
@@ -46509,7 +47064,7 @@ index e4c8adc..6d19a92 100755
fi
if test $ol_link_threads = mach ; then
-@@ -19630,7 +21687,7 @@ fi
+@@ -19630,7 +21729,7 @@ fi
$as_echo "#define HAVE_MACH_CTHREADS 1" >>confdefs.h
elif test $ol_with_threads = found ; then
@@ -46518,7 +47073,7 @@ index e4c8adc..6d19a92 100755
fi
;;
esac
-@@ -19640,7 +21697,7 @@ case $ol_with_threads in auto | yes | pth)
+@@ -19640,7 +21739,7 @@ case $ol_with_threads in auto | yes | pth)
for ac_header in pth.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pth.h" "ac_cv_header_pth_h" "$ac_includes_default"
@@ -46527,7 +47082,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_PTH_H 1
_ACEOF
-@@ -19653,7 +21710,7 @@ done
+@@ -19653,7 +21752,7 @@ done
if test $ac_cv_header_pth_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pth_version in -lpth" >&5
$as_echo_n "checking for pth_version in -lpth... " >&6; }
@@ -46536,7 +47091,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -19687,7 +21744,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19687,7 +21786,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pth_pth_version" >&5
$as_echo "$ac_cv_lib_pth_pth_version" >&6; }
@@ -46545,7 +47100,7 @@ index e4c8adc..6d19a92 100755
have_pth=yes
else
have_pth=no
-@@ -19716,8 +21773,7 @@ case $ol_with_threads in auto | yes | lwp)
+@@ -19716,8 +21815,7 @@ case $ol_with_threads in auto | yes | lwp)
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -46555,7 +47110,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -19730,7 +21786,7 @@ done
+@@ -19730,7 +21828,7 @@ done
test $ac_cv_header_synch_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thr_create in -lthread" >&5
$as_echo_n "checking for thr_create in -lthread... " >&6; }
@@ -46564,7 +47119,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -19764,7 +21820,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19764,7 +21862,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thread_thr_create" >&5
$as_echo "$ac_cv_lib_thread_thr_create" >&6; }
@@ -46573,7 +47128,7 @@ index e4c8adc..6d19a92 100755
have_thr=yes
else
have_thr=no
-@@ -19789,8 +21845,7 @@ $as_echo "#define HAVE_THR 1" >>confdefs.h
+@@ -19789,8 +21887,7 @@ $as_echo "#define HAVE_THR 1" >>confdefs.h
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -46583,7 +47138,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19819,8 +21874,7 @@ $as_echo "$as_me: WARNING: thread defines and link options must be set manually"
+@@ -19819,8 +21916,7 @@ $as_echo "$as_me: WARNING: thread defines and link options must be set manually"
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -46593,7 +47148,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -19833,8 +21887,7 @@ done
+@@ -19833,8 +21929,7 @@ done
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -46603,7 +47158,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19845,7 +21898,7 @@ done
+@@ -19845,7 +21940,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5
$as_echo_n "checking for LinuxThreads pthread.h... " >&6; }
@@ -46612,7 +47167,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -19874,7 +21927,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
+@@ -19874,7 +21969,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
for ac_header in mach/cthreads.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mach/cthreads.h" "ac_cv_header_mach_cthreads_h" "$ac_includes_default"
@@ -46621,7 +47176,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_MACH_CTHREADS_H 1
_ACEOF
-@@ -19887,8 +21940,7 @@ done
+@@ -19887,8 +21982,7 @@ done
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -46631,7 +47186,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -19917,7 +21969,7 @@ if test $ol_link_threads != no && test $ol_link_threads != nt ; then
+@@ -19917,7 +22011,7 @@ if test $ol_link_threads != no && test $ol_link_threads != nt ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread specific errno" >&5
$as_echo_n "checking for thread specific errno... " >&6; }
@@ -46640,7 +47195,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19946,7 +21998,7 @@ $as_echo "$ol_cv_errno_thread_specific" >&6; }
+@@ -19946,7 +22040,7 @@ $as_echo "$ol_cv_errno_thread_specific" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread specific h_errno" >&5
$as_echo_n "checking for thread specific h_errno... " >&6; }
@@ -46649,7 +47204,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -19983,7 +22035,7 @@ fi
+@@ -19983,7 +22077,7 @@ fi
if test $ol_link_threads = no ; then
if test $ol_with_threads = yes ; then
@@ -46658,7 +47213,7 @@ index e4c8adc..6d19a92 100755
fi
if test $ol_with_threads = auto ; then
-@@ -20015,8 +22067,7 @@ for ac_func in \
+@@ -20015,8 +22109,7 @@ for ac_func in \
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -46668,7 +47223,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -20030,7 +22081,7 @@ if test "$ac_cv_func_ctime_r" = no ; then
+@@ -20030,7 +22123,7 @@ if test "$ac_cv_func_ctime_r" = no ; then
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of ctime_r" >&5
$as_echo_n "checking number of arguments of ctime_r... " >&6; }
@@ -46677,7 +47232,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -20100,7 +22151,7 @@ fi
+@@ -20100,7 +22193,7 @@ fi
if test "$ac_cv_func_gethostbyname_r" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of gethostbyname_r" >&5
$as_echo_n "checking number of arguments of gethostbyname_r... " >&6; }
@@ -46686,7 +47241,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -20186,7 +22237,7 @@ fi
+@@ -20186,7 +22279,7 @@ fi
if test "$ac_cv_func_gethostbyaddr_r" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of gethostbyaddr_r" >&5
$as_echo_n "checking number of arguments of gethostbyaddr_r... " >&6; }
@@ -46695,7 +47250,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -20281,7 +22332,7 @@ if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
+@@ -20281,7 +22374,7 @@ if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
for ac_header in db.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
@@ -46704,7 +47259,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_DB_H 1
_ACEOF
-@@ -20293,7 +22344,7 @@ done
+@@ -20293,7 +22386,7 @@ done
if test $ac_cv_header_db_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB major version in db.h" >&5
$as_echo_n "checking for Berkeley DB major version in db.h... " >&6; }
@@ -46713,7 +47268,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20314,12 +22365,12 @@ fi
+@@ -20314,12 +22407,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_bdb_major" >&5
$as_echo "$ol_cv_bdb_major" >&6; }
case $ol_cv_bdb_major in [1-9]*) : ;; *)
@@ -46728,7 +47283,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20340,12 +22391,12 @@ fi
+@@ -20340,12 +22433,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_bdb_minor" >&5
$as_echo "$ol_cv_bdb_minor" >&6; }
case $ol_cv_bdb_minor in [0-9]*) : ;; *)
@@ -46743,7 +47298,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20384,7 +22435,7 @@ $as_echo "$ol_cv_bdb_compat" >&6; }
+@@ -20384,7 +22477,7 @@ $as_echo "$ol_cv_bdb_compat" >&6; }
if test $ol_cv_bdb_compat != yes ; then
@@ -46752,7 +47307,7 @@ index e4c8adc..6d19a92 100755
fi
ol_cv_lib_db=no
-@@ -20393,7 +22444,7 @@ if test $ol_cv_bdb_major = 5 ; then
+@@ -20393,7 +22486,7 @@ if test $ol_cv_bdb_major = 5 ; then
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5.$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5.$ol_cv_bdb_minor)... " >&6; }
@@ -46761,7 +47316,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20456,7 +22507,7 @@ fi
+@@ -20456,7 +22549,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb5$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb5$ol_cv_bdb_minor)... " >&6; }
@@ -46770,7 +47325,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20519,7 +22570,7 @@ fi
+@@ -20519,7 +22612,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5$ol_cv_bdb_minor)... " >&6; }
@@ -46779,7 +47334,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20582,7 +22633,7 @@ fi
+@@ -20582,7 +22675,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5-$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5-$ol_cv_bdb_minor)... " >&6; }
@@ -46788,7 +47343,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20645,7 +22696,7 @@ fi
+@@ -20645,7 +22738,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5)... " >&6; }
@@ -46797,7 +47352,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20708,7 +22759,7 @@ fi
+@@ -20708,7 +22801,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb5)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb5)... " >&6; }
@@ -46806,7 +47361,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20772,7 +22823,7 @@ elif test $ol_cv_bdb_major = 4 ; then
+@@ -20772,7 +22865,7 @@ elif test $ol_cv_bdb_major = 4 ; then
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4.$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4.$ol_cv_bdb_minor)... " >&6; }
@@ -46815,7 +47370,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20835,7 +22886,7 @@ fi
+@@ -20835,7 +22928,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb4$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb4$ol_cv_bdb_minor)... " >&6; }
@@ -46824,7 +47379,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20898,7 +22949,7 @@ fi
+@@ -20898,7 +22991,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4$ol_cv_bdb_minor)... " >&6; }
@@ -46833,7 +47388,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -20961,7 +23012,7 @@ fi
+@@ -20961,7 +23054,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4-$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4-$ol_cv_bdb_minor)... " >&6; }
@@ -46842,7 +47397,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21024,7 +23075,7 @@ fi
+@@ -21024,7 +23117,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4)... " >&6; }
@@ -46851,7 +47406,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21087,7 +23138,7 @@ fi
+@@ -21087,7 +23180,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb4)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb4)... " >&6; }
@@ -46860,7 +47415,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21151,7 +23202,7 @@ fi
+@@ -21151,7 +23244,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb)... " >&6; }
@@ -46869,7 +47424,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21214,7 +23265,7 @@ fi
+@@ -21214,7 +23307,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (default)" >&5
$as_echo_n "checking for Berkeley DB link (default)... " >&6; }
@@ -46878,7 +47433,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21279,7 +23330,7 @@ fi
+@@ -21279,7 +23372,7 @@ fi
ol_cv_berkeley_db=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB library and header version match" >&5
$as_echo_n "checking for Berkeley DB library and header version match... " >&6; }
@@ -46887,7 +47442,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21345,12 +23396,12 @@ fi
+@@ -21345,12 +23438,12 @@ fi
$as_echo "$ol_cv_berkeley_db_version" >&6; }
if test $ol_cv_berkeley_db_version = no ; then
@@ -46902,7 +47457,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -21457,7 +23508,7 @@ fi
+@@ -21457,7 +23550,7 @@ fi
if test $ol_cv_berkeley_db = no ; then
@@ -46911,7 +47466,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -21489,7 +23540,7 @@ if test $ol_enable_wrappers != no ; then
+@@ -21489,7 +23582,7 @@ if test $ol_enable_wrappers != no ; then
for ac_header in tcpd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
@@ -46920,7 +47475,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_TCPD_H 1
_ACEOF
-@@ -21574,7 +23625,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h
+@@ -21574,7 +23667,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h
WRAP_LIBS="-lwrap"
elif test $ol_enable_wrappers = yes ; then
@@ -46929,7 +47484,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find TCP wrappers, support disabled" >&5
$as_echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;}
-@@ -21584,13 +23635,12 @@ fi
+@@ -21584,13 +23677,12 @@ fi
if test $ol_enable_syslog != no ; then
ac_fn_c_check_func "$LINENO" "openlog" "ac_cv_func_openlog"
@@ -46945,7 +47500,7 @@ index e4c8adc..6d19a92 100755
fi
ol_enable_syslog=$ac_cv_func_openlog
fi
-@@ -21601,15 +23651,14 @@ if test $ol_enable_sql != no ; then
+@@ -21601,15 +23693,14 @@ if test $ol_enable_sql != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -46963,7 +47518,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -21629,7 +23678,7 @@ done
+@@ -21629,7 +23720,7 @@ done
iodbc)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -liodbc" >&5
$as_echo_n "checking for SQLDriverConnect in -liodbc... " >&6; }
@@ -46972,7 +47527,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -21663,7 +23712,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21663,7 +23754,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_iodbc_SQLDriverConnect" >&6; }
@@ -46981,7 +47536,7 @@ index e4c8adc..6d19a92 100755
have_iodbc=yes
else
have_iodbc=no
-@@ -21677,7 +23726,7 @@ fi
+@@ -21677,7 +23768,7 @@ fi
unixodbc)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -lodbc" >&5
$as_echo_n "checking for SQLDriverConnect in -lodbc... " >&6; }
@@ -46990,7 +47545,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -21711,7 +23760,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21711,7 +23802,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_odbc_SQLDriverConnect" >&6; }
@@ -46999,7 +47554,7 @@ index e4c8adc..6d19a92 100755
have_odbc=yes
else
have_odbc=no
-@@ -21725,7 +23774,7 @@ fi
+@@ -21725,7 +23816,7 @@ fi
odbc32)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -lodbc32" >&5
$as_echo_n "checking for SQLDriverConnect in -lodbc32... " >&6; }
@@ -47008,7 +47563,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -21759,7 +23808,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21759,7 +23850,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc32_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_odbc32_SQLDriverConnect" >&6; }
@@ -47017,7 +47572,7 @@ index e4c8adc..6d19a92 100755
have_odbc32=yes
else
have_odbc32=no
-@@ -21804,7 +23853,7 @@ $as_echo "$have_odbc32" >&6; }
+@@ -21804,7 +23895,7 @@ $as_echo "$have_odbc32" >&6; }
;;
*)
@@ -47026,7 +47581,7 @@ index e4c8adc..6d19a92 100755
;;
esac
fi
-@@ -21816,7 +23865,7 @@ $as_echo "$have_odbc32" >&6; }
+@@ -21816,7 +23907,7 @@ $as_echo "$have_odbc32" >&6; }
SLAPD_SQL_LIBS="$ol_link_sql"
elif test $ol_enable_sql != auto ; then
@@ -47035,7 +47590,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -21826,7 +23875,7 @@ if test $ol_enable_ndb != no ; then
+@@ -21826,7 +23917,7 @@ if test $ol_enable_ndb != no ; then
set dummy mysql_config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -47044,7 +47599,16 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test -n "$MYSQL"; then
-@@ -21860,7 +23909,7 @@ fi
+@@ -21838,7 +23929,7 @@ 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
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MYSQL="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -21860,7 +23951,7 @@ fi
if test "$MYSQL" != yes ; then
@@ -47053,7 +47617,7 @@ index e4c8adc..6d19a92 100755
fi
SQL_INC=`mysql_config --include`
-@@ -21878,10 +23927,10 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -21878,10 +23969,10 @@ if ac_fn_c_try_cpp "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -47066,7 +47630,7 @@ index e4c8adc..6d19a92 100755
CPPFLAGS="$save_CPPFLAGS"
SQL_LIB=`mysql_config --libs_r`
-@@ -21892,7 +23941,7 @@ rm -f conftest.err conftest.$ac_ext
+@@ -21892,7 +23983,7 @@ rm -f conftest.err conftest.$ac_ext
LDFLAGS="$SQL_LIB"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ndb_init in -lndbclient" >&5
$as_echo_n "checking for ndb_init in -lndbclient... " >&6; }
@@ -47075,7 +47639,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -21926,11 +23975,11 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21926,11 +24017,11 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbclient_ndb_init" >&5
$as_echo "$ac_cv_lib_ndbclient_ndb_init" >&6; }
@@ -47089,7 +47653,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -21947,8 +23996,7 @@ for ac_header in unicode/utypes.h
+@@ -21947,8 +24038,7 @@ for ac_header in unicode/utypes.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -47099,7 +47663,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -21962,7 +24010,7 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then
+@@ -21962,7 +24052,7 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU libraries" >&5
$as_echo_n "checking for ICU libraries... " >&6; }
@@ -47108,7 +47672,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -22018,8 +24066,7 @@ if test $ol_with_cyrus_sasl != no ; then
+@@ -22018,8 +24108,7 @@ if test $ol_with_cyrus_sasl != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -47118,7 +47682,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -22033,7 +24080,7 @@ done
+@@ -22033,7 +24122,7 @@ done
test $ac_cv_header_sasl_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
@@ -47127,7 +47691,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -22067,12 +24114,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22067,12 +24156,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
$as_echo "$ac_cv_lib_sasl2_sasl_client_init" >&6; }
@@ -47142,7 +47706,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -22106,7 +24153,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22106,7 +24195,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl_sasl_client_init" >&5
$as_echo "$ac_cv_lib_sasl_sasl_client_init" >&6; }
@@ -47151,7 +47715,7 @@ index e4c8adc..6d19a92 100755
ol_link_sasl="-lsasl"
fi
-@@ -22116,7 +24163,7 @@ fi
+@@ -22116,7 +24205,7 @@ fi
if test $ol_link_sasl = no ; then
if test $ol_with_cyrus_sasl != auto ; then
@@ -47160,7 +47724,7 @@ index e4c8adc..6d19a92 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate Cyrus SASL" >&5
$as_echo "$as_me: WARNING: Could not locate Cyrus SASL" >&2;}
-@@ -22130,7 +24177,7 @@ $as_echo "$as_me: WARNING: Strong authentication not supported!" >&2;}
+@@ -22130,7 +24219,7 @@ $as_echo "$as_me: WARNING: Strong authentication not supported!" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Cyrus SASL library version" >&5
$as_echo_n "checking Cyrus SASL library version... " >&6; }
@@ -47169,7 +47733,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -22166,7 +24213,7 @@ $as_echo "$ol_cv_sasl_compat" >&6; }
+@@ -22166,7 +24255,7 @@ $as_echo "$ol_cv_sasl_compat" >&6; }
if test $ol_cv_sasl_compat = no ; then
ol_link_sasl=no
@@ -47178,7 +47742,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -22180,7 +24227,7 @@ $as_echo "#define HAVE_CYRUS_SASL 1" >>confdefs.h
+@@ -22180,7 +24269,7 @@ $as_echo "#define HAVE_CYRUS_SASL 1" >>confdefs.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $ol_link_sasl"
ac_fn_c_check_func "$LINENO" "sasl_version" "ac_cv_func_sasl_version"
@@ -47187,7 +47751,7 @@ index e4c8adc..6d19a92 100755
$as_echo "#define HAVE_SASL_VERSION 1" >>confdefs.h
-@@ -22229,7 +24276,7 @@ if test $ol_with_fetch != no ; then
+@@ -22229,7 +24318,7 @@ if test $ol_with_fetch != no ; then
LIBS="-lfetch -lcom_err $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking fetch(3) library" >&5
$as_echo_n "checking fetch(3) library... " >&6; }
@@ -47196,7 +47760,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -22273,7 +24320,7 @@ fi
+@@ -22273,7 +24362,7 @@ fi
ol_link_fetch=freebsd
elif test $ol_with_fetch != auto ; then
@@ -47205,7 +47769,7 @@ index e4c8adc..6d19a92 100755
fi
fi
-@@ -22282,14 +24329,14 @@ if test $ol_enable_crypt != no ; then
+@@ -22282,14 +24371,14 @@ if test $ol_enable_crypt != no ; then
LIBS="$TLS_LIBS $LIBS"
ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
@@ -47222,7 +47786,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -22323,7 +24370,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22323,7 +24412,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
@@ -47231,7 +47795,7 @@ index e4c8adc..6d19a92 100755
LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
have_crypt=yes
else
-@@ -22343,7 +24390,7 @@ $as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+@@ -22343,7 +24432,7 @@ $as_echo "#define HAVE_CRYPT 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find crypt" >&5
$as_echo "$as_me: WARNING: could not find crypt" >&2;}
if test $ol_enable_crypt = yes ; then
@@ -47240,7 +47804,7 @@ index e4c8adc..6d19a92 100755
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling crypt support" >&5
-@@ -22354,13 +24401,13 @@ fi
+@@ -22354,13 +24443,13 @@ fi
if test $ol_enable_proctitle != no ; then
ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
@@ -47256,7 +47820,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -22394,7 +24441,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22394,7 +24483,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
@@ -47265,7 +47829,7 @@ index e4c8adc..6d19a92 100755
have_setproctitle=yes
LUTIL_LIBS="$LUTIL_LIBS -lutil"
else
-@@ -22423,8 +24470,7 @@ if test $ol_enable_slp != no ; then
+@@ -22423,8 +24512,7 @@ if test $ol_enable_slp != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -47275,7 +47839,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -22437,7 +24483,7 @@ done
+@@ -22437,7 +24525,7 @@ done
if test $ac_cv_header_slp_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLPOpen in -lslp" >&5
$as_echo_n "checking for SLPOpen in -lslp... " >&6; }
@@ -47284,7 +47848,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -22471,7 +24517,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22471,7 +24559,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_slp_SLPOpen" >&5
$as_echo "$ac_cv_lib_slp_SLPOpen" >&6; }
@@ -47293,7 +47857,7 @@ index e4c8adc..6d19a92 100755
have_slp=yes
else
have_slp=no
-@@ -22485,13 +24531,13 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h
+@@ -22485,13 +24573,13 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h
fi
elif test $ol_enable_slp = yes ; then
@@ -47309,7 +47873,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22502,7 +24548,7 @@ _ACEOF
+@@ -22502,7 +24590,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
@@ -47318,7 +47882,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22513,7 +24559,7 @@ _ACEOF
+@@ -22513,7 +24601,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
@@ -47327,7 +47891,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22524,7 +24570,7 @@ _ACEOF
+@@ -22524,7 +24612,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
@@ -47336,7 +47900,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22535,7 +24581,7 @@ _ACEOF
+@@ -22535,7 +24623,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "caddr_t" "ac_cv_type_caddr_t" "$ac_includes_default"
@@ -47345,7 +47909,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22546,7 +24592,7 @@ _ACEOF
+@@ -22546,7 +24634,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
@@ -47354,7 +47918,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22558,7 +24604,7 @@ fi
+@@ -22558,7 +24646,7 @@ fi
ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
@@ -47363,7 +47927,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LONG_LONG 1
-@@ -22568,7 +24614,7 @@ _ACEOF
+@@ -22568,7 +24656,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
@@ -47372,7 +47936,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_PTRDIFF_T 1
-@@ -22584,14 +24630,14 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_de
+@@ -22584,14 +24672,14 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_de
#include <sys/socket.h>
#endif
"
@@ -47389,7 +47953,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -22643,7 +24689,7 @@ fi
+@@ -22643,7 +24731,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
@@ -47398,7 +47962,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22679,7 +24725,7 @@ ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_inclu
+@@ -22679,7 +24767,7 @@ ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_inclu
#include <signal.h>
"
@@ -47407,7 +47971,7 @@ index e4c8adc..6d19a92 100755
else
-@@ -22692,7 +24738,7 @@ fi
+@@ -22692,7 +24780,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
@@ -47416,7 +47980,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22723,7 +24769,7 @@ fi
+@@ -22723,7 +24811,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
@@ -47425,7 +47989,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22758,7 +24804,7 @@ fi
+@@ -22758,7 +24846,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
@@ -47434,7 +47998,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22792,7 +24838,7 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+@@ -22792,7 +24880,7 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
@@ -47443,7 +48007,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-@@ -22804,7 +24850,7 @@ fi
+@@ -22804,7 +24892,7 @@ fi
ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" "$ac_includes_default
#include <pwd.h>
"
@@ -47452,7 +48016,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_PASSWD_PW_GECOS 1
-@@ -22816,7 +24862,7 @@ fi
+@@ -22816,7 +24904,7 @@ fi
ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_passwd_pw_passwd" "$ac_includes_default
#include <pwd.h>
"
@@ -47461,7 +48025,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
-@@ -22828,7 +24874,7 @@ fi
+@@ -22828,7 +24916,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if toupper() requires islower()" >&5
$as_echo_n "checking if toupper() requires islower()... " >&6; }
@@ -47470,7 +48034,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
-@@ -22867,7 +24913,7 @@ fi
+@@ -22867,7 +24955,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
@@ -47479,7 +48043,48 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22947,7 +24993,7 @@ fi
+@@ -22876,11 +24964,11 @@ else
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
++
+ #ifndef __cplusplus
+- /* Ultrix mips cc rejects this. */
++ /* Ultrix mips cc rejects this sort of thing. */
+ typedef int charset[2];
+- const charset cs;
++ const charset cs = { 0, 0 };
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *pcpcc;
+ char **ppc;
+@@ -22897,8 +24985,9 @@ main ()
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
+- { /* SCO 3.2v4 cc rejects this. */
+- char *t;
++ { /* SCO 3.2v4 cc rejects this sort of thing. */
++ char tx;
++ char *t = &tx;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+ *t++ = 0;
+@@ -22914,10 +25003,10 @@ main ()
+ iptr p = 0;
+ ++p;
+ }
+- { /* AIX XL C 1.02.0.0 rejects this saying
++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+- struct s { int j; const int *ap[3]; };
+- struct s *b; b->j = 5;
++ struct s { int j; const int *ap[3]; } bx;
++ struct s *b = &bx; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+@@ -22947,7 +25036,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler understands volatile" >&5
$as_echo_n "checking if compiler understands volatile... " >&6; }
@@ -47488,7 +48093,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22990,7 +25036,7 @@ $as_echo "#define CROSS_COMPILING 1" >>confdefs.h
+@@ -22990,7 +25079,7 @@ $as_echo "#define CROSS_COMPILING 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -47497,7 +48102,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
-@@ -23208,7 +25254,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+@@ -23208,7 +25297,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
;; #(
*)
@@ -47506,7 +48111,7 @@ index e4c8adc..6d19a92 100755
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-@@ -23220,7 +25266,7 @@ fi
+@@ -23220,7 +25309,7 @@ fi
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
$as_echo_n "checking size of short... " >&6; }
@@ -47515,7 +48120,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
-@@ -23229,9 +25275,8 @@ else
+@@ -23229,9 +25318,8 @@ else
if test "$ac_cv_type_short" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -47527,7 +48132,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_sizeof_short=0
fi
-@@ -23254,7 +25299,7 @@ _ACEOF
+@@ -23254,7 +25342,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
$as_echo_n "checking size of int... " >&6; }
@@ -47536,7 +48141,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-@@ -23263,9 +25308,8 @@ else
+@@ -23263,9 +25351,8 @@ else
if test "$ac_cv_type_int" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -47548,7 +48153,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_sizeof_int=0
fi
-@@ -23288,7 +25332,7 @@ _ACEOF
+@@ -23288,7 +25375,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
$as_echo_n "checking size of long... " >&6; }
@@ -47557,7 +48162,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-@@ -23297,9 +25341,8 @@ else
+@@ -23297,9 +25384,8 @@ else
if test "$ac_cv_type_long" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -47569,7 +48174,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_sizeof_long=0
fi
-@@ -23322,7 +25365,7 @@ _ACEOF
+@@ -23322,7 +25408,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
$as_echo_n "checking size of long long... " >&6; }
@@ -47578,7 +48183,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
-@@ -23331,9 +25374,8 @@ else
+@@ -23331,9 +25417,8 @@ else
if test "$ac_cv_type_long_long" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -47590,7 +48195,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_sizeof_long_long=0
fi
-@@ -23356,7 +25398,7 @@ _ACEOF
+@@ -23356,7 +25441,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
$as_echo_n "checking size of wchar_t... " >&6; }
@@ -47599,7 +48204,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default"; then :
-@@ -23365,9 +25407,8 @@ else
+@@ -23365,9 +25450,8 @@ else
if test "$ac_cv_type_wchar_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -47611,7 +48216,7 @@ index e4c8adc..6d19a92 100755
else
ac_cv_sizeof_wchar_t=0
fi
-@@ -23415,7 +25456,7 @@ if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
+@@ -23415,7 +25499,7 @@ if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
$as_echo "#define USE_MP_LONG_LONG 1" >>confdefs.h
elif test $ol_with_mp = longlong ; then
@@ -47620,7 +48225,7 @@ index e4c8adc..6d19a92 100755
fi
fi
if test $ol_with_mp = long || test $ol_with_mp = auto ; then
-@@ -23425,14 +25466,14 @@ if test $ol_with_mp = long || test $ol_with_mp = auto ; then
+@@ -23425,14 +25509,14 @@ if test $ol_with_mp = long || test $ol_with_mp = auto ; then
$as_echo "#define USE_MP_LONG 1" >>confdefs.h
elif test $ol_with_mp = long ; then
@@ -47637,7 +48242,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_BN_H 1
_ACEOF
-@@ -23444,7 +25485,7 @@ done
+@@ -23444,7 +25528,7 @@ done
for ac_header in openssl/crypto.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
@@ -47646,7 +48251,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_CRYPTO_H 1
_ACEOF
-@@ -23461,14 +25502,14 @@ done
+@@ -23461,14 +25545,14 @@ done
$as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h
elif test $ol_with_mp = bignum ; then
@@ -47663,7 +48268,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_GMP_H 1
_ACEOF
-@@ -23479,7 +25520,7 @@ done
+@@ -23479,7 +25563,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_add_ui in -lgmp" >&5
$as_echo_n "checking for __gmpz_add_ui in -lgmp... " >&6; }
@@ -47672,7 +48277,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -23513,7 +25554,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23513,7 +25597,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_add_ui" >&5
$as_echo "$ac_cv_lib_gmp___gmpz_add_ui" >&6; }
@@ -47681,7 +48286,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGMP 1
_ACEOF
-@@ -23528,7 +25569,7 @@ $as_echo "#define USE_MP_GMP 1" >>confdefs.h
+@@ -23528,7 +25612,7 @@ $as_echo "#define USE_MP_GMP 1" >>confdefs.h
ol_with_mp=gmp
elif test $ol_with_mp = gmp ; then
@@ -47690,7 +48295,7 @@ index e4c8adc..6d19a92 100755
fi
fi
if test $ol_with_mp = auto ; then
-@@ -23537,7 +25578,7 @@ fi
+@@ -23537,7 +25621,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
@@ -47699,7 +48304,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -23607,7 +25648,7 @@ fi
+@@ -23607,7 +25691,7 @@ fi
for ac_func in strftime
do :
ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
@@ -47708,7 +48313,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
-@@ -23616,7 +25657,7 @@ else
+@@ -23616,7 +25700,7 @@ else
# strftime is in -lintl on SCO UNIX.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
$as_echo_n "checking for strftime in -lintl... " >&6; }
@@ -47717,7 +48322,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -23650,7 +25691,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23650,7 +25734,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
@@ -47726,7 +48331,7 @@ index e4c8adc..6d19a92 100755
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
-@@ -23662,7 +25703,7 @@ done
+@@ -23662,7 +25746,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton()" >&5
$as_echo_n "checking for inet_aton()... " >&6; }
@@ -47735,7 +48340,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -23709,7 +25750,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+@@ -23709,7 +25793,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
ac_fn_c_check_func "$LINENO" "_spawnlp" "ac_cv_func__spawnlp"
@@ -47744,7 +48349,7 @@ index e4c8adc..6d19a92 100755
$as_echo "#define HAVE_SPAWNLP 1" >>confdefs.h
-@@ -23717,7 +25758,7 @@ fi
+@@ -23717,7 +25801,7 @@ fi
ac_fn_c_check_func "$LINENO" "_snprintf" "ac_cv_func__snprintf"
@@ -47753,7 +48358,7 @@ index e4c8adc..6d19a92 100755
ac_cv_func_snprintf=yes
$as_echo "#define snprintf _snprintf" >>confdefs.h
-@@ -23730,8 +25771,7 @@ for ac_func in vsnprintf _vsnprintf
+@@ -23730,8 +25814,7 @@ for ac_func in vsnprintf _vsnprintf
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -47763,7 +48368,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -23750,13 +25790,13 @@ fi
+@@ -23750,13 +25833,13 @@ fi
for ac_func in vprintf
do :
ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
@@ -47779,7 +48384,7 @@ index e4c8adc..6d19a92 100755
$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-@@ -23772,8 +25812,7 @@ if test $ac_cv_func_vprintf = yes ; then
+@@ -23772,8 +25855,7 @@ if test $ac_cv_func_vprintf = yes ; then
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -47789,7 +48394,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -23844,8 +25883,7 @@ for ac_func in \
+@@ -23844,8 +25926,7 @@ for ac_func in \
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -47799,7 +48404,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -23854,25 +25892,31 @@ fi
+@@ -23854,25 +25935,31 @@ fi
done
@@ -47843,7 +48448,7 @@ index e4c8adc..6d19a92 100755
-@@ -23885,8 +25929,7 @@ if test "$ac_cv_func_getpeereid" != yes; then
+@@ -23885,8 +25972,7 @@ if test "$ac_cv_func_getpeereid" != yes; then
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -47853,7 +48458,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -23900,7 +25943,7 @@ done
+@@ -23900,7 +25986,7 @@ done
#include <sys/socket.h>
#endif
"
@@ -47862,7 +48467,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN 1
-@@ -23915,7 +25958,7 @@ fi
+@@ -23915,7 +26001,7 @@ fi
#include <sys/socket.h>
#endif
"
@@ -47871,7 +48476,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-@@ -23926,7 +25969,7 @@ fi
+@@ -23926,7 +26012,7 @@ fi
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_fstype" "ac_cv_member_struct_stat_st_fstype" "$ac_includes_default"
@@ -47880,7 +48485,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_FSTYPE 1
-@@ -23935,7 +25978,7 @@ _ACEOF
+@@ -23935,7 +26021,7 @@ _ACEOF
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_vfstype" "ac_cv_member_struct_stat_st_vfstype" "$ac_includes_default"
@@ -47889,7 +48494,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_VFSTYPE 1
-@@ -23983,7 +26026,7 @@ if test "$ol_enable_slapi" != no ; then
+@@ -23983,7 +26069,7 @@ if test "$ol_enable_slapi" != no ; then
for ac_header in ltdl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
@@ -47898,7 +48503,7 @@ index e4c8adc..6d19a92 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_LTDL_H 1
_ACEOF
-@@ -23994,11 +26037,11 @@ done
+@@ -23994,11 +26080,11 @@ done
if test $ac_cv_header_ltdl_h != yes ; then
@@ -47912,7 +48517,7 @@ index e4c8adc..6d19a92 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -24032,7 +26075,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -24032,7 +26118,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
@@ -47921,7 +48526,7 @@ index e4c8adc..6d19a92 100755
SLAPI_LIBS=-lltdl
LIBSLAPI=slapi/libslapi.la
-@@ -24041,7 +26084,7 @@ $as_echo "#define HAVE_LIBLTDL 1" >>confdefs.h
+@@ -24041,7 +26127,7 @@ $as_echo "#define HAVE_LIBLTDL 1" >>confdefs.h
else
@@ -47930,7 +48535,7 @@ index e4c8adc..6d19a92 100755
fi
-@@ -24113,7 +26156,7 @@ $as_echo "$as_me: WARNING: ACIs need dynacl" >&2;}
+@@ -24113,7 +26199,7 @@ $as_echo "$as_me: WARNING: ACIs need dynacl" >&2;}
fi
if test "$ol_enable_aci" = mod ; then
MFLAG=SLAPD_MOD_DYNAMIC
@@ -47939,7 +48544,7 @@ index e4c8adc..6d19a92 100755
else
MFLAG=SLAPD_MOD_STATIC
fi
-@@ -24842,390 +26885,1664 @@ fi
+@@ -24842,390 +26928,1616 @@ fi
@@ -47983,6 +48588,14 @@ index e4c8adc..6d19a92 100755
+LTLIBOBJS=$ac_ltlibobjs
+
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
++$as_echo_n "checking that generated files are newer than configure... " >&6; }
++ if test -n "$am_sleep_pid"; then
++ # Hide warnings about reused PIDs.
++ wait $am_sleep_pid 2>/dev/null
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
++$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
@@ -48302,16 +48915,16 @@ index e4c8adc..6d19a92 100755
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
++ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
-+ as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+else
-+ as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
@@ -48371,28 +48984,16 @@ index e4c8adc..6d19a92 100755
+ as_mkdir_p=false
+fi
+
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in #(
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -48414,7 +49015,7 @@ index e4c8adc..6d19a92 100755
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
@@ -48480,10 +49081,10 @@ index e4c8adc..6d19a92 100755
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+config.status
-+configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
+
-+Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
@@ -48574,7 +49175,7 @@ index e4c8adc..6d19a92 100755
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
-+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
@@ -48892,19 +49493,7 @@ index e4c8adc..6d19a92 100755
-DEFS=-DHAVE_CONFIG_H
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
--ac_libobjs=
--ac_ltlibobjs=
--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$//'
-- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-- # will be set to the directory where LIBOBJS objects are built.
-- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
--done
--LIBOBJS=$ac_libobjs
++
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
@@ -48957,10 +49546,22 @@ index e4c8adc..6d19a92 100755
+ "tests/progs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk" ;;
+ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
--LTLIBOBJS=$ac_ltlibobjs
+-ac_libobjs=
+-ac_ltlibobjs=
+-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$//'
+- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+- # will be set to the directory where LIBOBJS objects are built.
+- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
-+done
+ done
+-LIBOBJS=$ac_libobjs
+-
+-LTLIBOBJS=$ac_ltlibobjs
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -49092,25 +49693,7 @@ index e4c8adc..6d19a92 100755
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
-+
-+{
-+ echo "cat >conf$$subs.awk <<_ACEOF" &&
-+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+ echo "_ACEOF"
-+} >conf$$subs.sh ||
-+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ . ./conf$$subs.sh ||
-+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+
-+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+ if test $ac_delim_n = $ac_delim_num; then
-+ break
-+ elif $ac_last_try; then
-+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
+- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
@@ -49123,12 +49706,11 @@ index e4c8adc..6d19a92 100755
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
+- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
--
+
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
@@ -49137,9 +49719,35 @@ index e4c8adc..6d19a92 100755
- PATH_SEPARATOR=';'
- }
-fi
++{
++ echo "cat >conf$$subs.awk <<_ACEOF" &&
++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
++ echo "_ACEOF"
++} >conf$$subs.sh ||
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ . ./conf$$subs.sh ||
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++ if test $ac_delim_n = $ac_delim_num; then
++ break
++ elif $ac_last_try; then
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
+done
+rm -f conf$$subs.sh
+-# IFS
+-# We need space, tab and new line, in precisely that order. Quoting is
+-# there to prevent editors from complaining about space-tab.
+-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+-# splitting by setting IFS to empty value.)
+-IFS=" "" $as_nl"
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
@@ -49193,12 +49801,17 @@ index e4c8adc..6d19a92 100755
+ for (key in S) S_is_set[key] = 1
+ FS = ""
--# IFS
--# We need space, tab and new line, in precisely that order. Quoting is
--# there to prevent editors from complaining about space-tab.
--# (If _AS_PATH_WALK were called with IFS unset, it would disable word
--# splitting by setting IFS to empty value.)
--IFS=" "" $as_nl"
+-# Find who we are. Look in the path if we contain no directory separator.
+-case $0 in #((
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+- done
+-IFS=$as_save_IFS
+}
+{
+ line = $ 0
@@ -49217,20 +49830,6 @@ index e4c8adc..6d19a92 100755
+ len += 1 + keylen
+ }
--# Find who we are. Look in the path if we contain no directory separator.
--case $0 in #((
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-- done
--IFS=$as_save_IFS
-+ print line
-+}
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -49242,16 +49841,8 @@ index e4c8adc..6d19a92 100755
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+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
-+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-+_ACEOF
++ print line
++}
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
@@ -49264,6 +49855,22 @@ index e4c8adc..6d19a92 100755
-PS1='$ '
-PS2='> '
-PS4='+ '
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++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
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
++_ACEOF
+
+-# NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
@@ -49287,16 +49894,11 @@ index e4c8adc..6d19a92 100755
+}'
+fi
--# NLS nuisances.
--LC_ALL=C
--export LC_ALL
--LANGUAGE=C
--export LANGUAGE
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
--# CDPATH.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
@@ -49305,10 +49907,6 @@ index e4c8adc..6d19a92 100755
+BEGIN {
+_ACEOF
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -49320,6 +49918,14 @@ index e4c8adc..6d19a92 100755
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+- fi
+- $as_echo "$as_me: error: $1" >&2
+- as_fn_exit $as_status
+-} # as_fn_error
++# Transform confdefs.h into an awk script `defines.awk', embedded as
++# here-document in config.status, that substitutes the proper values into
++# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
@@ -49331,11 +49937,7 @@ index e4c8adc..6d19a92 100755
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-- $as_echo "$as_me: error: $1" >&2
-- as_fn_exit $as_status
--} # as_fn_error
--
++ fi
+done
-# as_fn_set_status STATUS
@@ -49529,7 +50131,12 @@ index e4c8adc..6d19a92 100755
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+ done
-+
+
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+- as_dirname=dirname
+-else
+- as_dirname=false
+-fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
@@ -49549,24 +50156,19 @@ index e4c8adc..6d19a92 100755
+ *) ac_sed_conf_input=$configure_input;;
+ esac
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-- as_dirname=dirname
--else
-- as_dirname=false
--fi
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
-+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+ esac
-+ ;;
-+ esac
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
++ case $ac_tag in
++ *:-:* | *:-) cat >"$ac_tmp/stdin" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ esac
++ ;;
++ esac
++
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -49622,27 +50224,11 @@ index e4c8adc..6d19a92 100755
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
-+esac
+ esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+ .) # We are building in place.
-+ ac_srcdir=.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
@@ -49662,17 +50248,62 @@ index e4c8adc..6d19a92 100755
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-+
+- else
+- as_ln_s='cp -p'
+- fi
+-else
+- as_ln_s='cp -p'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+-rmdir conf$$.dir 2>/dev/null
++case $srcdir in
++ .) # We are building in place.
++ ac_srcdir=.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
++ ac_srcdir=$srcdir$ac_dir_suffix;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+-# as_fn_mkdir_p
+-# -------------
+-# Create "$as_dir" as a directory, including parents if necessary.
+-as_fn_mkdir_p ()
+-{
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
-+
+
+- case $as_dir in #(
+- -*) as_dir=./$as_dir;;
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+ esac
+ esac
+- test -d "$as_dir" || eval $as_mkdir_p || {
+- as_dirs=
+- while :; do
+- case $as_dir in #(
+- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+- *) as_qdir=$as_dir;;
+- esac
+- as_dirs="'$as_qdir' $as_dirs"
+- as_dir=`$as_dirname -- "$as_dir" ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
@@ -49772,17 +50403,11 @@ index e4c8adc..6d19a92 100755
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
- else
-- as_ln_s='cp -p'
++ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
- fi
--else
-- as_ln_s='cp -p'
--fi
--rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
--rmdir conf$$.dir 2>/dev/null
++ fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
@@ -49818,20 +50443,13 @@ index e4c8adc..6d19a92 100755
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-
++
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
-
--# as_fn_mkdir_p
--# -------------
--# Create "$as_dir" as a directory, including parents if necessary.
--as_fn_mkdir_p ()
--{
-
-- case $as_dir in #(
-- -*) as_dir=./$as_dir;;
++
++
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
@@ -49840,28 +50458,14 @@ index e4c8adc..6d19a92 100755
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
- esac
-- test -d "$as_dir" || eval $as_mkdir_p || {
-- as_dirs=
-- while :; do
-- case $as_dir in #(
-- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-- *) as_qdir=$as_dir;;
-- esac
-- as_dirs="'$as_qdir' $as_dirs"
-- as_dir=`$as_dirname -- "$as_dir" ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
++ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
++ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
@@ -49874,42 +50478,31 @@ index e4c8adc..6d19a92 100755
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -25243,959 +28555,687 @@ $as_echo X"$as_dir" |
+ q
+ }
+ s/.*/./; q'`
+- test -d "$as_dir" && break
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
++ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
@@ -49918,14 +50511,23 @@ index e4c8adc..6d19a92 100755
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -25243,959 +28560,645 @@ $as_echo X"$as_dir" |
- q
- }
- s/.*/./; q'`
-- test -d "$as_dir" && break
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
@@ -51435,7 +52037,7 @@ index e4c8adc..6d19a92 100755
;;
"default":C)
chmod +x tests/run
-@@ -26321,7 +29324,7 @@ _ACEOF
+@@ -26321,7 +29361,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -51444,7 +52046,7 @@ index e4c8adc..6d19a92 100755
# configure is writing to config.log, and then calls config.status.
-@@ -26342,7 +29345,7 @@ if test "$no_create" != yes; then
+@@ -26342,7 +29382,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.
@@ -51454,7 +52056,7 @@ index e4c8adc..6d19a92 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/include/portable.hin b/include/portable.hin
-index 8c42a51..69816b4 100644
+index d71a033..21b8f17 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -48,6 +48,9 @@
@@ -51558,5 +52160,5 @@ index 8c42a51..69816b4 100644
/* Define to the type of arg 3 for `accept'. */
#undef ber_socklen_t
--
-1.7.11.7
+1.8.1.4
diff --git a/openldap-evolution-ntlm.patch b/openldap-evolution-ntlm.patch
index a2c1962..638903d 100644
--- a/openldap-evolution-ntlm.patch
+++ b/openldap-evolution-ntlm.patch
@@ -1,9 +1,11 @@
Get rid of this patch as soon as possible.
More details are provided in README.evolution
---- openldap-2.4.24.orig/include/ldap.h
-+++ openldap-2.4.24/include/ldap.h
-@@ -2518,5 +2518,26 @@ ldap_parse_deref_control LDAP_P((
+diff --git a/include/ldap.h b/include/ldap.h
+index 3791732..fe01b18 100644
+--- a/include/ldap.h
++++ b/include/ldap.h
+@@ -2517,5 +2517,26 @@ ldap_parse_deref_control LDAP_P((
LDAPControl **ctrls,
LDAPDerefRes **drp ));
@@ -30,9 +32,11 @@ More details are provided in README.evolution
+
LDAP_END_DECL
#endif /* _LDAP_H */
---- openldap-2.4.24.orig/libraries/libldap/Makefile.in
-+++ openldap-2.4.24/libraries/libldap/Makefile.in
-@@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur
+diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
+index ce4be1b..2326680 100644
+--- a/libraries/libldap/Makefile.in
++++ b/libraries/libldap/Makefile.in
+@@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest urltest
SRCS = bind.c open.c result.c error.c compare.c search.c \
controls.c messages.c references.c extended.c cyrus.c \
modify.c add.c modrdn.c delete.c abandon.c \
@@ -41,7 +45,7 @@ More details are provided in README.evolution
filter.c free.c sort.c passwd.c whoami.c \
getdn.c getentry.c getattr.c getvalues.c addentry.c \
request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
-@@ -33,7 +33,7 @@ SRCS = bind.c open.c result.c error.c co
+@@ -33,7 +33,7 @@ SRCS = bind.c open.c result.c error.c compare.c search.c \
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
controls.lo messages.lo references.lo extended.lo cyrus.lo \
modify.lo add.lo modrdn.lo delete.lo abandon.lo \
@@ -50,8 +54,11 @@ More details are provided in README.evolution
filter.lo free.lo sort.lo passwd.lo whoami.lo \
getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+diff --git a/libraries/libldap/ntlm.c b/libraries/libldap/ntlm.c
+new file mode 100644
+index 0000000..e0734d5
--- /dev/null
-+++ openldap-2.4.24/libraries/libldap/ntlm.c
++++ b/libraries/libldap/ntlm.c
@@ -0,0 +1,137 @@
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
+/*
diff --git a/openldap-fedora-systemd.patch b/openldap-fedora-systemd.patch
index 3d2dcce..fa59ca2 100644
--- a/openldap-fedora-systemd.patch
+++ b/openldap-fedora-systemd.patch
@@ -6,10 +6,11 @@ Fedora specific patch.
Author: Jan Vcelak <jvcelak at redhat.com>
-diff -uNPrp openldap-2.4.26/servers/slapd/main.c openldap-2.4.26.fix/servers/slapd/main.c
---- openldap-2.4.26/servers/slapd/main.c 2011-06-30 17:13:36.000000000 +0200
-+++ openldap-2.4.26.fix/servers/slapd/main.c 2011-10-27 17:05:02.641066298 +0200
-@@ -682,6 +682,10 @@ unhandled_option:;
+diff --git a/servers/slapd/main.c b/servers/slapd/main.c
+index dac4864..83614f4 100644
+--- a/servers/slapd/main.c
++++ b/servers/slapd/main.c
+@@ -685,6 +685,10 @@ unhandled_option:;
}
}
diff --git a/openldap-ldaprc-currentdir.patch b/openldap-ldaprc-currentdir.patch
index 25feff8..420c1f9 100644
--- a/openldap-ldaprc-currentdir.patch
+++ b/openldap-ldaprc-currentdir.patch
@@ -4,9 +4,11 @@ Resolves: #38402
Upstream: ITS #1131
Author: Henning Schmiedehausen <hps at intermeta.de>
---- openldap-2.4.24.orig/libraries/libldap/init.c
-+++ openldap-2.4.24/libraries/libldap/init.c
-@@ -346,9 +346,6 @@ static void openldap_ldap_init_w_usercon
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 8617527..e6b17b4 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -352,9 +352,6 @@ static void openldap_ldap_init_w_userconf(const char *file)
if(path != NULL) {
LDAP_FREE(path);
}
diff --git a/openldap-manpages.patch b/openldap-manpages.patch
index ac9715e..1678b38 100644
--- a/openldap-manpages.patch
+++ b/openldap-manpages.patch
@@ -2,9 +2,11 @@ Various manual pages changes:
* removes LIBEXECDIR from slapd.8
* removes references to non-existing manpages (bz 624616)
---- openldap-2.4.24.orig/doc/man/man1/ldapmodify.1
-+++ openldap-2.4.24/doc/man/man1/ldapmodify.1
-@@ -364,9 +364,7 @@ exit status and a diagnostic message bei
+diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
+index 3def6da..466c772 100644
+--- a/doc/man/man1/ldapmodify.1
++++ b/doc/man/man1/ldapmodify.1
+@@ -397,9 +397,7 @@ exit status and a diagnostic message being written to standard error.
.BR ldap_add_ext (3),
.BR ldap_delete_ext (3),
.BR ldap_modify_ext (3),
@@ -15,9 +17,11 @@ Various manual pages changes:
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
---- openldap-2.4.24.orig/doc/man/man5/ldap.conf.5
-+++ openldap-2.4.24/doc/man/man5/ldap.conf.5
-@@ -317,6 +317,7 @@ certificates in separate individual file
+diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
+index cfde143..63592cb 100644
+--- a/doc/man/man5/ldap.conf.5
++++ b/doc/man/man5/ldap.conf.5
+@@ -317,6 +317,7 @@ certificates in separate individual files. The
.B TLS_CACERT
is always used before
.B TLS_CACERTDIR.
@@ -25,8 +29,10 @@ Various manual pages changes:
This parameter is ignored with GnuTLS.
When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
---- openldap-2.4.24.orig/doc/man/man5/ldif.5
-+++ openldap-2.4.24/doc/man/man5/ldif.5
+diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
+index 79615b6..2c06246 100644
+--- a/doc/man/man5/ldif.5
++++ b/doc/man/man5/ldif.5
@@ -270,8 +270,7 @@ commands.
.BR ldapmodify (1),
.BR slapadd (8),
@@ -37,9 +43,11 @@ Various manual pages changes:
.LP
"LDAP Data Interchange Format," Good, G., RFC 2849.
.SH ACKNOWLEDGEMENTS
---- openldap-2.4.24.orig/doc/man/man5/slapd-config.5
-+++ openldap-2.4.24/doc/man/man5/slapd-config.5
-@@ -2068,7 +2068,6 @@ default slapd configuration directory
+diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
+index 742876a..31643c7 100644
+--- a/doc/man/man5/slapd-config.5
++++ b/doc/man/man5/slapd-config.5
+@@ -2086,7 +2086,6 @@ default slapd configuration directory
.BR slapd.conf (5),
.BR slapd.overlays (5),
.BR slapd.plugin (5),
@@ -47,9 +55,11 @@ Various manual pages changes:
.BR slapd (8),
.BR slapacl (8),
.BR slapadd (8),
---- openldap-2.4.24.orig/doc/man/man5/slapd.conf.5
-+++ openldap-2.4.24/doc/man/man5/slapd.conf.5
-@@ -1998,7 +1998,6 @@ default slapd configuration file
+diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
+index 0a3a955..352cc7e 100644
+--- a/doc/man/man5/slapd.conf.5
++++ b/doc/man/man5/slapd.conf.5
+@@ -2016,7 +2016,6 @@ default slapd configuration file
.BR slapd.backends (5),
.BR slapd.overlays (5),
.BR slapd.plugin (5),
@@ -57,18 +67,20 @@ Various manual pages changes:
.BR slapd (8),
.BR slapacl (8),
.BR slapadd (8),
---- openldap-2.4.24.orig/doc/man/man8/slapd.8
-+++ openldap-2.4.24/doc/man/man8/slapd.8
+diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
+index b739f4d..e2a1a00 100644
+--- a/doc/man/man8/slapd.8
++++ b/doc/man/man8/slapd.8
@@ -5,7 +5,7 @@
.SH NAME
slapd \- Stand-alone LDAP Daemon
.SH SYNOPSIS
-.B LIBEXECDIR/slapd
-+.B slapd
++.B slapd
[\c
.BR \-4 | \-6 ]
[\c
-@@ -301,7 +301,7 @@ the LDAP databases defined in the defaul
+@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type:
.LP
.nf
.ft tt
@@ -77,7 +89,7 @@ Various manual pages changes:
.ft
.fi
.LP
-@@ -312,7 +312,7 @@ on voluminous debugging which will be pr
+@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type:
.LP
.nf
.ft tt
@@ -86,7 +98,7 @@ Various manual pages changes:
.ft
.fi
.LP
-@@ -320,7 +320,7 @@ To test whether the configuration file i
+@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type:
.LP
.nf
.ft tt
@@ -95,3 +107,6 @@ Various manual pages changes:
.ft
.fi
.LP
+--
+1.8.1.4
+
diff --git a/openldap-nss-certs-from-certdb-fallback-pem.patch b/openldap-nss-certs-from-certdb-fallback-pem.patch
index d58b76a..d20e48a 100644
--- a/openldap-nss-certs-from-certdb-fallback-pem.patch
+++ b/openldap-nss-certs-from-certdb-fallback-pem.patch
@@ -12,7 +12,7 @@ Upstream ITS: #7389
Resolves: #857455
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
-index 61d71d4..f15f0bc 100644
+index 6847bea..8339391 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -1412,7 +1412,7 @@ tlsm_ctx_load_private_key( tlsm_ctx *ctx )
@@ -24,7 +24,7 @@ index 61d71d4..f15f0bc 100644
ctx->tc_private_key = PK11_FindKeyByDERCert( ctx->tc_certdb_slot, ctx->tc_certificate, pin_arg );
else
ctx->tc_private_key = PK11_FindKeyByAnyCert( ctx->tc_certificate, pin_arg );
-@@ -1900,8 +1900,6 @@ tlsm_deferred_init( void *arg )
+@@ -1909,8 +1909,6 @@ tlsm_deferred_init( void *arg )
}
return -1;
}
@@ -33,7 +33,7 @@ index 61d71d4..f15f0bc 100644
}
NSS_SetDomesticPolicy();
-@@ -2354,15 +2352,9 @@ tlsm_deferred_ctx_init( void *arg )
+@@ -2363,15 +2361,9 @@ tlsm_deferred_ctx_init( void *arg )
/* set up our cert and key, if any */
if ( lt->lt_certfile ) {
@@ -52,7 +52,7 @@ index 61d71d4..f15f0bc 100644
char *tmp_certname;
if ( tlsm_is_tokenname_certnick( lt->lt_certfile )) {
-@@ -2382,8 +2374,31 @@ tlsm_deferred_ctx_init( void *arg )
+@@ -2391,8 +2383,31 @@ tlsm_deferred_ctx_init( void *arg )
Debug( LDAP_DEBUG_ANY,
"TLS: error: the certificate '%s' could not be found in the database - error %d:%s.\n",
lt->lt_certfile, errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
@@ -84,6 +84,3 @@ index 61d71d4..f15f0bc 100644
}
}
---
-1.7.11.7
-
diff --git a/openldap-reentrant-gethostby.patch b/openldap-reentrant-gethostby.patch
index 97de7a5..140b6e3 100644
--- a/openldap-reentrant-gethostby.patch
+++ b/openldap-reentrant-gethostby.patch
@@ -7,8 +7,10 @@ the functions, even if we're not being compiled for use in libldap_r
Resolves: #179730
Author: Jeffery Layton <jlayton at redhat.com>
---- openldap-2.4.24.orig/libraries/libldap/util-int.c
-+++ openldap-2.4.24/libraries/libldap/util-int.c
+diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
+index 373c81c..a012062 100644
+--- a/libraries/libldap/util-int.c
++++ b/libraries/libldap/util-int.c
@@ -52,8 +52,8 @@ extern int h_errno;
#ifndef LDAP_R_COMPILE
# undef HAVE_REENTRANT_FUNCTIONS
@@ -20,7 +22,7 @@ Author: Jeffery Layton <jlayton at redhat.com>
#else
# include <ldap_pvt_thread.h>
-@@ -312,7 +312,7 @@ ldap_pvt_csnstr(char *buf, size_t len, u
+@@ -317,7 +317,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
#define BUFSTART (1024-32)
#define BUFMAX (32*1024-32)
diff --git a/openldap-syncrepl-unset-tls-options.patch b/openldap-syncrepl-unset-tls-options.patch
index 51836a8..156971a 100644
--- a/openldap-syncrepl-unset-tls-options.patch
+++ b/openldap-syncrepl-unset-tls-options.patch
@@ -4,15 +4,11 @@ Author: Patrick Monnerat <pm at datasphere.ch>
Upstream ITS: #7042
Resolves: #734187
----
- libraries/libldap/tls2.c | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 5c35fb5..4c9eb30 100644
+index 654a4bf..10b993b 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
-@@ -731,27 +731,27 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
+@@ -735,27 +735,27 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
return 0;
case LDAP_OPT_X_TLS_CACERTFILE:
if ( lo->ldo_tls_cacertfile ) LDAP_FREE( lo->ldo_tls_cacertfile );
@@ -46,7 +42,7 @@ index 5c35fb5..4c9eb30 100644
return 0;
case LDAP_OPT_X_TLS_REQUIRE_CERT:
if ( !arg ) return -1;
-@@ -779,7 +779,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
+@@ -783,7 +783,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
#endif
case LDAP_OPT_X_TLS_CIPHER_SUITE:
if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
@@ -55,7 +51,7 @@ index 5c35fb5..4c9eb30 100644
return 0;
case LDAP_OPT_X_TLS_PROTOCOL_MIN:
-@@ -790,7 +790,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
+@@ -794,7 +794,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
if ( ld != NULL )
return -1;
if ( lo->ldo_tls_randfile ) LDAP_FREE (lo->ldo_tls_randfile );
@@ -64,6 +60,3 @@ index 5c35fb5..4c9eb30 100644
break;
case LDAP_OPT_X_TLS_NEWCTX:
if ( !arg ) return -1;
---
-1.7.6.1
-
diff --git a/openldap-tls-no-reuse-of-tls_session.patch b/openldap-tls-no-reuse-of-tls_session.patch
index 4d08ada..5c397d1 100644
--- a/openldap-tls-no-reuse-of-tls_session.patch
+++ b/openldap-tls-no-reuse-of-tls_session.patch
@@ -11,10 +11,10 @@ Upstream ITS: #7373
Resolves: #852476
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index f0b5bef..b13cb6d 100644
+index 10b993b..a3cd590 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
-@@ -316,7 +316,7 @@ update_flags( Sockbuf *sb, tls_session * ssl, int rc )
+@@ -320,7 +320,7 @@ update_flags( Sockbuf *sb, tls_session * ssl, int rc )
*/
static int
@@ -23,7 +23,7 @@ index f0b5bef..b13cb6d 100644
{
Sockbuf *sb = conn->lconn_sb;
int err;
-@@ -361,6 +361,10 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn )
+@@ -365,6 +365,10 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn *conn )
errno = WSAGetLastError();
#endif
@@ -34,7 +34,7 @@ index f0b5bef..b13cb6d 100644
if ( err < 0 )
{
char buf[256], *msg;
-@@ -491,7 +495,15 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
+@@ -495,7 +499,15 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
{
tls_session *session = s;
@@ -51,13 +51,25 @@ index f0b5bef..b13cb6d 100644
}
int
-@@ -831,25 +843,11 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
- /*
- * Fortunately, the lib uses blocking io...
- */
-- if ( ldap_int_tls_connect( ld, conn ) < 0 ) {
-+ if ( ldap_int_tls_connect( ld, conn, host ) < 0 ) {
- ld->ld_errno = LDAP_CONNECT_ERROR;
+@@ -857,7 +869,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
+ #endif /* LDAP_USE_NON_BLOCKING_TLS */
+
+ ld->ld_errno = LDAP_SUCCESS;
+- ret = ldap_int_tls_connect( ld, conn );
++ ret = ldap_int_tls_connect( ld, conn, host );
+
+ #ifdef LDAP_USE_NON_BLOCKING_TLS
+ while ( ret > 0 ) { /* this should only happen for non-blocking io */
+@@ -878,7 +890,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
+ } else {
+ /* ldap_int_poll called ldap_pvt_ndelay_off */
+ ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_SET_NONBLOCK, sb );
+- ret = ldap_int_tls_connect( ld, conn );
++ ret = ldap_int_tls_connect( ld, conn, host );
+ if ( ret > 0 ) { /* need to call tls_connect once more */
+ struct timeval curr_time_tv, delta_tv;
+
+@@ -935,20 +947,6 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
return (ld->ld_errno);
}
@@ -78,6 +90,3 @@ index f0b5bef..b13cb6d 100644
return LDAP_SUCCESS;
}
---
-1.7.11.4
-
diff --git a/openldap-userconfig-setgid.patch b/openldap-userconfig-setgid.patch
index 55b16d6..70f0d28 100644
--- a/openldap-userconfig-setgid.patch
+++ b/openldap-userconfig-setgid.patch
@@ -3,9 +3,11 @@ This patch adds the same behavior for GID.
Author: Nalin Dahyabhai <nalin at redhat.com>
---- openldap-2.4.24.orig/libraries/libldap/init.c
-+++ openldap-2.4.24/libraries/libldap/init.c
-@@ -670,7 +670,7 @@ void ldap_int_initialize( struct ldapopt
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index e6b17b4..fbf4829 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -678,7 +678,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
#ifdef HAVE_GETEUID
diff --git a/openldap.spec b/openldap.spec
index da9615a..718360e 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,8 +7,8 @@
%global systemctl_bin /usr/bin/systemctl
Name: openldap
-Version: 2.4.33
-Release: 4%{?dist}
+Version: 2.4.34
+Release: 1%{?dist}
Summary: LDAP support libraries
Group: System Environment/Daemons
License: OpenLDAP
@@ -44,7 +44,6 @@ Patch12: openldap-tls-no-reuse-of-tls_session.patch
Patch13: openldap-nss-regex-search-hashed-cacert-dir.patch
Patch14: openldap-nss-ignore-certdb-type-prefix.patch
Patch15: openldap-nss-certs-from-certdb-fallback-pem.patch
-Patch16: openldap-rwm-slapd-segfault-modrdn.patch
# Fedora specific patches
Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -162,7 +161,6 @@ ln -s %{_includedir}/nspr4 include/nspr
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
%patch102 -p1
@@ -620,6 +618,10 @@ exit 0
%{evolution_connector_prefix}/
%changelog
+* Wed Mar 06 2013 Jan Vcelak <jvcelak at fedoraproject.org> 2.4.34-1
+- new upstream release (#917603)
+- fix: slapcat segfaults if cn=config.ldif not present (#872784)
+
* Thu Jan 31 2013 Jan Synáček <jsynacek at redhat.com> 2.4.33-4
- rebuild against new cyrus-sasl
diff --git a/sources b/sources
index 987e7cb..6c1ce8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5adae44897647c15ce5abbff313bc85a openldap-2.4.33.tgz
+df93a62e396ac312333cdeab0c5b48b6 openldap-2.4.34.tgz
More information about the scm-commits
mailing list