From 587944c9e6029db997006c3961a23e807e40cc63 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 11 Oct 2012 11:47:24 +0200 Subject: [PATCH] new upstream release (2.4.33) --- .gitignore | 1 + openldap-autoconf-pkgconfig-nss.patch | 12 +- ...-858274.patch => openldap-autoreconf.patch | 12109 +++++++--------- openldap-constraint-count.patch | 203 - ...p-nss-certs-from-certdb-fallback-pem.patch | 35 +- openldap-nss-ignore-certdb-sql-prefix.patch | 31 - openldap-nss-ignore-certdb-type-prefix.patch | 47 + openldap-nss-prefer-unlocked-key.patch | 81 - openldap.spec | 42 +- sources | 2 +- 10 files changed, 5105 insertions(+), 7458 deletions(-) rename openldap-workaround-m4-858274.patch => openldap-autoreconf.patch (93%) delete mode 100644 openldap-constraint-count.patch delete mode 100644 openldap-nss-ignore-certdb-sql-prefix.patch create mode 100644 openldap-nss-ignore-certdb-type-prefix.patch delete mode 100644 openldap-nss-prefer-unlocked-key.patch diff --git a/.gitignore b/.gitignore index f566e2d..c49f049 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /openldap-2.4.30.tgz /openldap-2.4.31.tgz /openldap-2.4.32.tgz +/openldap-2.4.33.tgz diff --git a/openldap-autoconf-pkgconfig-nss.patch b/openldap-autoconf-pkgconfig-nss.patch index 3b11eea..8b4bb19 100644 --- a/openldap-autoconf-pkgconfig-nss.patch +++ b/openldap-autoconf-pkgconfig-nss.patch @@ -3,14 +3,14 @@ Use pkg-config for Mozilla NSS library detection Author: Jan Vcelak --- - configure.in | 20 +++++--------------- - 1 file changed, 5 insertions(+), 15 deletions(-) + configure.in | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in -index f0f8d99..2a9cfb4 100644 +index ecffe30..2a9cfb4 100644 --- a/configure.in +++ b/configure.in -@@ -1223,26 +1223,16 @@ if test $ol_link_tls = no ; then +@@ -1223,28 +1223,16 @@ if test $ol_link_tls = no ; then fi fi @@ -35,7 +35,9 @@ index f0f8d99..2a9cfb4 100644 - [define if you have MozNSS]) - TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" - else +- if test $ol_with_tls = moznss ; then - AC_MSG_ERROR([MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)]) +- fi + AC_DEFINE(HAVE_MOZNSS, 1, [define if you have MozNSS]) + TLS_LIBS="$MOZNSS_LIBS" + CFLAGS="$CFLAGS $MOZNSS_CFLAGS" @@ -43,5 +45,5 @@ index f0f8d99..2a9cfb4 100644 fi fi -- -1.7.10.4 +1.7.11.7 diff --git a/openldap-workaround-m4-858274.patch b/openldap-autoreconf.patch similarity index 93% rename from openldap-workaround-m4-858274.patch rename to openldap-autoreconf.patch index 3dc9dc7..05f2ebe 100644 --- a/openldap-workaround-m4-858274.patch +++ b/openldap-autoreconf.patch @@ -1,40 +1,34 @@ -Workaround for bug #858274 in m4 due to which autoreconf generates broken configure on i686. +Changes performed by autoreconf (necessary because we patch the build process) -for f in config.sub config.guess missing; do - rm build/$f - cp /usr/share/libtool/config/$f build/$f -done -AUTOMAKE=/bin/true autoreconf --force --install +AUTOMAKE=/bin/true autoreconf --install --force +rm -rf autom4te.cache/ Author: Jan Vcelak --- - aclocal.m4 | 12740 ++++++++++++++++++++++--------------- - build/config.guess | 259 +- - build/config.sub | 164 +- - build/ltmain.sh | 14547 ++++++++++++++++++++++++------------------ - build/missing | 249 +- - configure | 16644 +++++++++++++++++++++++++++++-------------------- + aclocal.m4 | 12640 +++++++++++++++++++++++--------------- + build/ltmain.sh | 14547 +++++++++++++++++++++++++------------------ + configure | 16379 +++++++++++++++++++++++++++++-------------------- include/portable.hin | 41 +- - 7 files changed, 26596 insertions(+), 18048 deletions(-) + 4 files changed, 26026 insertions(+), 17581 deletions(-) mode change 100755 => 100644 build/ltmain.sh diff --git a/aclocal.m4 b/aclocal.m4 -index d5ecbec..0b3622e 100644 +index d5ecbec..77f71fd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1,7 +1,7 @@ +@@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -+# generated automatically by aclocal 1.12.2 -*- Autoconf -*- -+ -+# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# generated automatically by aclocal 1.11.6 -*- Autoconf -*- --# 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,737 +11,943 @@ +@@ -11,581 +12,208 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -60,11 +54,11 @@ index d5ecbec..0b3622e 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.69],, -+[m4_warning([this file was generated for autoconf 2.69. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, ++[m4_warning([this file was generated for autoconf 2.68. +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-*- @@ -477,11 +471,9 @@ index d5ecbec..0b3622e 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], @@ -498,15 +490,7 @@ index d5ecbec..0b3622e 100644 - dirpart=`AS_DIRNAME("$mf")` - else - continue -+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 +- fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` @@ -532,13 +516,8 @@ index d5ecbec..0b3622e 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. @@ -553,31 +532,19 @@ index d5ecbec..0b3622e 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]) -# ----------------------------------------------- @@ -601,26 +568,17 @@ index d5ecbec..0b3622e 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 -+# 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 -fi -AC_SUBST([CYGPATH_W]) -+ ;; -+esac - +- -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], @@ -630,17 +588,11 @@ index d5ecbec..0b3622e 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 @@ -671,24 +623,12 @@ index d5ecbec..0b3622e 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. @@ -704,18 +644,13 @@ index d5ecbec..0b3622e 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. @@ -723,26 +658,15 @@ index d5ecbec..0b3622e 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], @@ -755,26 +679,12 @@ index d5ecbec..0b3622e 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. @@ -783,27 +693,9 @@ index d5ecbec..0b3622e 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], @@ -846,9 +738,268 @@ index d5ecbec..0b3622e 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 @@ -879,47 +1030,19 @@ index d5ecbec..0b3622e 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], @@ -930,44 +1053,20 @@ index d5ecbec..0b3622e 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], @@ -977,13 +1076,8 @@ index d5ecbec..0b3622e 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], @@ -996,17 +1090,8 @@ index d5ecbec..0b3622e 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 @@ -1014,26 +1099,8 @@ index d5ecbec..0b3622e 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 @@ -1045,23 +1112,8 @@ index d5ecbec..0b3622e 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 @@ -1069,17 +1121,8 @@ index d5ecbec..0b3622e 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 @@ -1099,15 +1142,8 @@ index d5ecbec..0b3622e 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 @@ -1118,40 +1154,20 @@ index d5ecbec..0b3622e 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 @@ -1178,25 +1194,11 @@ index d5ecbec..0b3622e 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' @@ -1591,11 +1593,11 @@ index d5ecbec..0b3622e 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 @@ -1612,7 +1614,7 @@ index d5ecbec..0b3622e 100644 ])# _LT_COMPILER_BOILERPLATE -@@ -749,207 +955,323 @@ $rm conftest* +@@ -749,207 +956,323 @@ $rm conftest* # ---------------------- # Check for linker boilerplate output or warnings with # the simple link test code. @@ -2111,7 +2113,7 @@ index d5ecbec..0b3622e 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 +1282,93 @@ ia64-*-hpux*) +@@ -960,86 +1283,93 @@ ia64-*-hpux*) echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in @@ -2270,7 +2272,7 @@ index d5ecbec..0b3622e 100644 esac fi rm -rf conftest* -@@ -1051,37 +1380,145 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +@@ -1051,37 +1381,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) @@ -2287,13 +2289,6 @@ index d5ecbec..0b3622e 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 @@ -2325,10 +2320,11 @@ index d5ecbec..0b3622e 100644 + esac + fi + rm -rf conftest* -+ ;; -+esac -+ -+need_locks="$enable_libtool_lock" + ;; +- ]) + esac + + need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + @@ -2399,7 +2395,8 @@ index d5ecbec..0b3622e 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 ;; @@ -2434,7 +2431,7 @@ index d5ecbec..0b3622e 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 +1529,56 @@ AC_CACHE_CHECK([$1], [$2], +@@ -1092,49 +1530,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:'` @@ -2509,7 +2506,7 @@ index d5ecbec..0b3622e 100644 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi -@@ -1142,22 +1586,28 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +@@ -1142,22 +1587,28 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], $2=yes fi fi @@ -2546,7 +2543,7 @@ index d5ecbec..0b3622e 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 +1629,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +@@ -1179,7 +1630,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=-1; ;; @@ -2555,7 +2552,7 @@ index d5ecbec..0b3622e 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 +1640,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +@@ -1190,6 +1641,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; @@ -2567,7 +2564,7 @@ index d5ecbec..0b3622e 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 +1664,17 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +@@ -1209,6 +1665,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` ;; @@ -2585,7 +2582,7 @@ index d5ecbec..0b3622e 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 +1688,47 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +@@ -1222,25 +1689,47 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl esac fi ;; @@ -2651,7 +2648,7 @@ index d5ecbec..0b3622e 100644 ;; esac ]) -@@ -1249,28 +1737,36 @@ if test -n $lt_cv_sys_max_cmd_len ; then +@@ -1249,28 +1738,36 @@ if test -n $lt_cv_sys_max_cmd_len ; then else AC_MSG_RESULT(none) fi @@ -2701,7 +2698,7 @@ index d5ecbec..0b3622e 100644 #include "confdefs.h" #if HAVE_DLFCN_H -@@ -1311,11 +1807,13 @@ else +@@ -1311,11 +1808,13 @@ else # endif #endif @@ -2718,7 +2715,7 @@ index d5ecbec..0b3622e 100644 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -1324,20 +1822,26 @@ int main () +@@ -1324,20 +1823,26 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -2749,7 +2746,7 @@ index d5ecbec..0b3622e 100644 esac else : # compilation failed -@@ -1345,13 +1849,13 @@ EOF +@@ -1345,13 +1850,13 @@ EOF fi fi rm -fr conftest* @@ -2768,7 +2765,7 @@ index d5ecbec..0b3622e 100644 if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown -@@ -1367,15 +1871,15 @@ else +@@ -1367,15 +1872,15 @@ else lt_cv_dlopen_self=yes ;; @@ -2787,7 +2784,7 @@ index d5ecbec..0b3622e 100644 darwin*) # if libdl is installed we need to link against it -@@ -1385,13 +1889,13 @@ else +@@ -1385,13 +1890,13 @@ else lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) @@ -2803,7 +2800,7 @@ index d5ecbec..0b3622e 100644 [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], -@@ -1399,7 +1903,7 @@ else +@@ -1399,7 +1904,7 @@ else [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], @@ -2812,7 +2809,7 @@ index d5ecbec..0b3622e 100644 ]) ]) ]) -@@ -1420,23 +1924,23 @@ else +@@ -1420,23 +1925,23 @@ else test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" @@ -2841,7 +2838,7 @@ index d5ecbec..0b3622e 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 +1962,36 @@ else +@@ -1458,22 +1963,36 @@ else *) enable_dlopen_self_static=unknown ;; esac fi @@ -2888,7 +2885,7 @@ index d5ecbec..0b3622e 100644 lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or -@@ -1484,46 +2002,50 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +@@ -1484,46 +2003,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:'` @@ -2957,7 +2954,7 @@ index d5ecbec..0b3622e 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 +2058,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" +@@ -1536,12 +2059,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" else need_locks=no fi @@ -2975,7 +2972,7 @@ index d5ecbec..0b3622e 100644 [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], [rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null -@@ -1553,40 +2076,46 @@ else +@@ -1553,40 +2077,46 @@ else fi rmdir .libs 2>/dev/null]) objdir=$lt_cv_objdir @@ -3039,7 +3036,7 @@ index d5ecbec..0b3622e 100644 # Fast installation is not supported enable_fast_install=no elif test "$shlibpath_overrides_runpath" = yes || -@@ -1594,43 +2123,121 @@ elif test "$shlibpath_overrides_runpath" = yes || +@@ -1594,43 +2124,121 @@ elif test "$shlibpath_overrides_runpath" = yes || # Fast installation is not necessary enable_fast_install=needless fi @@ -3181,7 +3178,7 @@ index d5ecbec..0b3622e 100644 library_names_spec= libname_spec='lib$name' soname_spec= -@@ -1644,20 +2251,6 @@ shlibpath_overrides_runpath=unknown +@@ -1644,20 +2252,6 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" @@ -3202,7 +3199,7 @@ index d5ecbec..0b3622e 100644 need_lib_prefix=unknown hardcode_into_libs=no -@@ -1667,7 +2260,7 @@ need_version=unknown +@@ -1667,7 +2261,7 @@ need_version=unknown case $host_os in aix3*) @@ -3211,7 +3208,7 @@ index d5ecbec..0b3622e 100644 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH -@@ -1675,8 +2268,8 @@ aix3*) +@@ -1675,8 +2269,8 @@ aix3*) soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -3222,7 +3219,7 @@ index d5ecbec..0b3622e 100644 need_lib_prefix=no need_version=no hardcode_into_libs=yes -@@ -1694,7 +2287,7 @@ aix4* | aix5*) +@@ -1694,7 +2288,7 @@ aix4* | aix5*) aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' @@ -3231,7 +3228,7 @@ index d5ecbec..0b3622e 100644 : else can_build_shared=no -@@ -1720,9 +2313,18 @@ aix4* | aix5*) +@@ -1720,9 +2314,18 @@ aix4* | aix5*) ;; amigaos*) @@ -3253,7 +3250,7 @@ index d5ecbec..0b3622e 100644 ;; beos*) -@@ -1732,7 +2334,7 @@ beos*) +@@ -1732,7 +2335,7 @@ beos*) ;; bsdi[[45]]*) @@ -3262,7 +3259,7 @@ index d5ecbec..0b3622e 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 +2347,112 @@ bsdi[[45]]*) +@@ -1745,61 +2348,112 @@ bsdi[[45]]*) # libtool to hard-code these into programs ;; @@ -3396,7 +3393,7 @@ index d5ecbec..0b3622e 100644 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -1809,22 +2462,18 @@ darwin* | rhapsody*) +@@ -1809,22 +2463,18 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no @@ -3423,7 +3420,7 @@ index d5ecbec..0b3622e 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 +2481,6 @@ dgux*) +@@ -1832,22 +2482,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; @@ -3446,7 +3443,7 @@ index d5ecbec..0b3622e 100644 freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. -@@ -1855,7 +2488,7 @@ freebsd* | dragonfly*) +@@ -1855,7 +2489,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in @@ -3455,7 +3452,7 @@ index d5ecbec..0b3622e 100644 *) objformat=elf ;; esac fi -@@ -1873,27 +2506,46 @@ freebsd* | dragonfly*) +@@ -1873,27 +2507,46 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -3505,7 +3502,7 @@ index d5ecbec..0b3622e 100644 hardcode_into_libs=yes ;; -@@ -1919,18 +2571,18 @@ hpux9* | hpux10* | hpux11*) +@@ -1919,18 +2572,18 @@ hpux9* | hpux10* | hpux11*) fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -3536,7 +3533,7 @@ index d5ecbec..0b3622e 100644 shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH -@@ -1939,8 +2591,22 @@ hpux9* | hpux10* | hpux11*) +@@ -1939,8 +2592,22 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac @@ -3560,7 +3557,7 @@ index d5ecbec..0b3622e 100644 ;; irix5* | irix6* | nonstopux*) -@@ -1948,7 +2614,7 @@ irix5* | irix6* | nonstopux*) +@@ -1948,7 +2615,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then @@ -3569,7 +3566,7 @@ index d5ecbec..0b3622e 100644 else version_type=irix fi ;; -@@ -1985,9 +2651,9 @@ linux*oldld* | linux*aout* | linux*coff*) +@@ -1985,9 +2652,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; @@ -3582,7 +3579,7 @@ index d5ecbec..0b3622e 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 +2661,35 @@ linux*) +@@ -1995,15 +2662,35 @@ linux*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -3620,7 +3617,7 @@ index d5ecbec..0b3622e 100644 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2015,23 +2701,11 @@ linux*) +@@ -2015,23 +2702,11 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; @@ -3645,7 +3642,7 @@ index d5ecbec..0b3622e 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 +2720,37 @@ netbsd*) +@@ -2046,34 +2721,37 @@ netbsd*) ;; newsos6) @@ -3690,7 +3687,7 @@ index d5ecbec..0b3622e 100644 case $host_os in openbsd2.[[89]] | openbsd2.[[89]].*) shlibpath_overrides_runpath=no -@@ -2107,15 +2784,12 @@ osf3* | osf4* | osf5*) +@@ -2107,15 +2785,12 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; @@ -3709,7 +3706,7 @@ index d5ecbec..0b3622e 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 +2813,8 @@ sunos4*) +@@ -2139,8 +2814,8 @@ sunos4*) need_version=yes ;; @@ -3720,7 +3717,7 @@ index d5ecbec..0b3622e 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 +2822,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +@@ -2148,7 +2823,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sni) shlibpath_overrides_runpath=no need_lib_prefix=no @@ -3728,7 +3725,7 @@ index d5ecbec..0b3622e 100644 runpath_var=LD_RUN_PATH ;; siemens) -@@ -2165,15 +2838,48 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +@@ -2165,15 +2839,48 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4*MP*) if test -d /usr/nec ;then @@ -3779,7 +3776,7 @@ index d5ecbec..0b3622e 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 +2891,61 @@ uts4*) +@@ -2185,273 +2892,61 @@ uts4*) esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no @@ -3866,7 +3863,7 @@ index d5ecbec..0b3622e 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" @@ -3874,7 +3871,7 @@ index d5ecbec..0b3622e 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" @@ -4103,7 +4100,7 @@ index d5ecbec..0b3622e 100644 AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in -@@ -2464,7 +2958,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +@@ -2464,7 +2959,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. @@ -4112,7 +4109,7 @@ index d5ecbec..0b3622e 100644 for ac_dir in $ac_dummy; do IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. -@@ -2479,7 +2973,7 @@ dnl not every word. This closes a longstanding sh security hole. +@@ -2479,7 +2974,7 @@ dnl not every word. This closes a longstanding sh security hole. $EGREP "$file_magic_regex" > /dev/null; then : else @@ -4121,7 +4118,7 @@ index d5ecbec..0b3622e 100644 *** Warning: the command libtool uses to detect shared libraries, *** $file_magic_cmd, produces output that libtool cannot recognize. -@@ -2490,7 +2984,7 @@ dnl not every word. This closes a longstanding sh security hole. +@@ -2490,7 +2985,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@gnu.org @@ -4130,7 +4127,7 @@ index d5ecbec..0b3622e 100644 fi ;; esac fi -@@ -2507,37 +3001,48 @@ if test -n "$MAGIC_CMD"; then +@@ -2507,37 +3002,48 @@ if test -n "$MAGIC_CMD"; then else AC_MSG_RESULT(no) fi @@ -4196,7 +4193,7 @@ index d5ecbec..0b3622e 100644 ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. -@@ -2554,9 +3059,9 @@ if test "$GCC" = yes; then +@@ -2554,9 +3060,9 @@ if test "$GCC" = yes; then [[\\/]]* | ?:[[\\/]]*) re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the pathname of ld @@ -4209,7 +4206,7 @@ index d5ecbec..0b3622e 100644 done test -z "$LD" && LD="$ac_prog" ;; -@@ -2606,15 +3111,24 @@ else +@@ -2606,15 +3112,24 @@ else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) @@ -4241,7 +4238,7 @@ index d5ecbec..0b3622e 100644 [# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &1 &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 +- +- -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and @@ -4686,11 +4715,10 @@ index d5ecbec..0b3622e 100644 - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - ++AC_SUBST([LIBM]) ++])# LT_LIB_M +- -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and @@ -4721,33 +4749,29 @@ index d5ecbec..0b3622e 100644 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= -+# _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 +- 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], @@ -4755,7 +4779,14 @@ index d5ecbec..0b3622e 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], @@ -4765,161 +4796,22 @@ index d5ecbec..0b3622e 100644 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: ++ _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_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_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 -- -- --# AC_LIBTOOL_GCJ --# -------------- --# enable support for GCJ libraries --AC_DEFUN([AC_LIBTOOL_GCJ], --[AC_REQUIRE([_LT_AC_LANG_GCJ]) --])# AC_LIBTOOL_GCJ -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL - - --# _LT_AC_LANG_GCJ --# --------------- --AC_DEFUN([_LT_AC_LANG_GCJ], --[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) --])# _LT_AC_LANG_GCJ -- -- --# AC_LIBTOOL_RC --# -------------- --# enable support for Windows resource files --AC_DEFUN([AC_LIBTOOL_RC], --[AC_REQUIRE([LT_AC_PROG_RC]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) --])# AC_LIBTOOL_RC -- -- --# AC_LIBTOOL_LANG_C_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_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) --AC_DEFUN([_LT_AC_LANG_C_CONFIG], --[lt_save_CC="$CC" --AC_LANG_PUSH(C) -- --# Source file extension for C test sources. --ac_ext=c -- --# Object file extension for compiled C test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -+# 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" -+# 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' - --_LT_AC_SYS_COMPILER -+# _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 -+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - --# --# Check for any special shared library compilation flags. --# --_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= --if test "$GCC" = no; then -- case $host_os in -- sco3.2v5*) -- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' -- ;; -+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]) -- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : -- else -- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) -- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no -- fi --fi - -+ _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. --# --AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), -- [], -- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- @@ -4933,15 +4825,12 @@ index d5ecbec..0b3622e 100644 +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) --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_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], @@ -4949,42 +4838,30 @@ index d5ecbec..0b3622e 100644 +# 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]) +# 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 +-# 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]]*\)' --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. +# 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' -- fi ++case $host_os in +aix*) + symcode='[[BCDT]]' - ;; -- --aix4* | aix5*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no ++ ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' - fi -- ;; ++ fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' @@ -5007,26 +4884,325 @@ index d5ecbec..0b3622e 100644 +sysv4) + symcode='[[DFNSTU]]' + ;; - 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]) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_C_CONFIG ++esac +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ +- +- +-# AC_LIBTOOL_RC +-# -------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[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 +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-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 + +-# 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(){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 + +-# 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 + +-# +-# Check for any special shared library compilation flags. +-# +-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' +- ;; +- 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]) +- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : +- else +- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) +- _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@_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t@_DLSYM_CONST ++#else ++# define LT@&t@_DLSYM_CONST const ++#endif + +-# +-# Check to make sure the static flag actually works. +-# +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $_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' + +-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) ++ cat <<_LT_EOF >> conftest.$ac_ext + +-# 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@_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} ++}; + +-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 + +-# 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' ++#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* + +-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= + fi +- ;; +-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' + +- -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are @@ -5056,89 +5232,34 @@ index d5ecbec..0b3622e 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 @@ -5161,17 +5282,7 @@ index d5ecbec..0b3622e 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 @@ -5179,97 +5290,34 @@ index d5ecbec..0b3622e 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@_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t@_DLSYM_CONST -+#else -+# define LT@&t@_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@_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' -+#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 +- else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else +- fi +- else - with_gnu_ld=no - wlarc= - @@ -5279,36 +5327,19 @@ index d5ecbec..0b3622e 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' -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 - fi -+ rm -rf conftest* conftst* - +- fi +- - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -+ # 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 +-else - GXX=no - with_gnu_ld=no - wlarc= -+ AC_MSG_RESULT(ok) - fi - +-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 @@ -5340,39 +5371,11 @@ index d5ecbec..0b3622e 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 @@ -5423,12 +5426,7 @@ index d5ecbec..0b3622e 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 @@ -5842,11 +5840,7 @@ index d5ecbec..0b3622e 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)=: @@ -5877,10 +5871,7 @@ index d5ecbec..0b3622e 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 @@ -5900,12 +5891,6 @@ index d5ecbec..0b3622e 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. + ;; + *) + ;; @@ -5942,6 +5927,86 @@ index d5ecbec..0b3622e 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? + ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- 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 + ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _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 +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd='echo' +- ;; +- osf3*) +- 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 +- # "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) + case $cc_basename in + KCC*) @@ -5991,90 +6056,13 @@ index d5ecbec..0b3622e 100644 + ;; + esac + ;; -+ esac - ;; -- esac -- ;; -- lynxos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- m88k*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ lynxos*) - ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ m88k*) - ;; -- esac -- ;; -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -- wlarc= -- _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 -- fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -- ;; -- openbsd2*) -- # C++ shared libraries are fairly broken -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- fi -- output_verbose_link_cmd='echo' -- ;; -- osf3*) -- 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 -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; + esac ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ netbsd*) ++ lynxos*) ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' @@ -6092,6 +6080,58 @@ index d5ecbec..0b3622e 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. @@ -6116,97 +6156,6 @@ index d5ecbec..0b3622e 100644 + ;; + *) + ;; -+ esac - ;; -- *) -- 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 -+ 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*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac - ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; + esac ;; - cxx*) @@ -6229,15 +6178,138 @@ index d5ecbec..0b3622e 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' -+ vxworks*) ++ 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(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 ++ solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ ;; ++ *) ++ ;; ++ esac + ;; +- 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*) ++ # Sun C++ 4.x ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac + ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac + ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac + ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ vxworks*) + ;; + *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac + ;; + 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 + fi +], +[ @@ -6245,8 +6317,7 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- output_verbose_link_cmd='echo' + case $host_os in + aix*) + # All AIX code is PIC. @@ -6256,10 +6327,15 @@ index d5ecbec..0b3622e 100644 + fi + ;; -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- # 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' + amigaos*) + case $host_cpu in + powerpc) @@ -6274,24 +6350,7 @@ index d5ecbec..0b3622e 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. + ;; @@ -6304,7 +6363,9 @@ index d5ecbec..0b3622e 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 @@ -6326,25 +6387,48 @@ index d5ecbec..0b3622e 100644 + # +Z the default ;; *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- # 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' + _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. @@ -6362,16 +6446,14 @@ index d5ecbec..0b3622e 100644 + ;; esac - ;; -- sunos4*) +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- tandem*) + case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- lcc*) -- # Lucid +- NCC*) +- # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + nvcc*) # Cuda Compiler Driver 2.2 @@ -6416,50 +6498,39 @@ index d5ecbec..0b3622e 100644 ;; - 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 +- 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 + 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' + ;; -- output_verbose_link_cmd='echo' +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" + 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' + ;; -- # 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' +-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) + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. @@ -6480,13 +6551,7 @@ index d5ecbec..0b3622e 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,,' @@ -6510,15 +6575,8 @@ index d5ecbec..0b3622e 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 @@ -6552,179 +6610,12 @@ index d5ecbec..0b3622e 100644 + 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' +-AC_LIBTOOL_CONFIG($1) + 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@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@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 @@ -6794,10 +6685,20 @@ index d5ecbec..0b3622e 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. @@ -6808,7 +6709,10 @@ index d5ecbec..0b3622e 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*) @@ -6832,7 +6736,17 @@ index d5ecbec..0b3622e 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. @@ -6840,7 +6754,12 @@ index d5ecbec..0b3622e 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" @@ -6855,9 +6774,166 @@ index d5ecbec..0b3622e 100644 - fi - fi - ;; -- -- *) ;; # Ignore the rest. ++ 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@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@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 + +-# 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. @@ -6898,34 +6974,12 @@ index d5ecbec..0b3622e 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 -- 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' ++ esac + ;; + *) + _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)= @@ -6968,10 +7022,8 @@ index d5ecbec..0b3622e 100644 +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= --case " $_LT_AC_TAGVAR(postdeps, $1) " in --*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; --esac --])# AC_LIBTOOL_POSTDEP_PREDEP +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -6990,38 +7042,23 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# 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 +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no + _LT_TAGVAR(ld_shlibs, $1)=yes --# Source file extension for f77 test sources. --ac_ext=f +-# 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 + # 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 @@ -7045,17 +7082,31 @@ index d5ecbec..0b3622e 100644 + lt_use_gnu_ld_interface=yes + ;; + esac -+ fi + 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]) --# Object file extension for compiled f77 test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-_LT_AC_TAGVAR(GCC, $1)="$G77" +-_LT_AC_TAGVAR(LD, $1)="$LD" + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' --# Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" +-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 + # 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. @@ -7078,8 +7129,6 @@ index d5ecbec..0b3622e 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]]*) @@ -7088,8 +7137,7 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER +-AC_LIBTOOL_CONFIG($1) +*** 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 @@ -7097,19 +7145,13 @@ index d5ecbec..0b3622e 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. --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_F77_CONFIG +_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) @@ -7125,8 +7167,14 @@ index d5ecbec..0b3622e 100644 + esac + ;; --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) +-# 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 + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported @@ -7138,8 +7186,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no +-# Source file extension for Java test sources. +-ac_ext=java + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. @@ -7167,32 +7215,16 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# 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]) +-# Object file extension for compiled Java test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext + 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 + ;; --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]) +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -7208,7 +7240,8 @@ index d5ecbec..0b3622e 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' + ;; --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then @@ -7257,8 +7290,8 @@ index d5ecbec..0b3622e 100644 + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --_LT_AC_TAGVAR(GCC, $1)="$G77" --_LT_AC_TAGVAR(LD, $1)="$LD" +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER + 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~ @@ -7266,13 +7299,9 @@ index d5ecbec..0b3622e 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 --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 +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself @@ -7292,6 +7321,12 @@ index d5ecbec..0b3622e 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' @@ -7302,15 +7337,14 @@ index d5ecbec..0b3622e 100644 + fi + ;; --AC_LIBTOOL_CONFIG($1) +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_F77_CONFIG +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +*** 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 @@ -7318,6 +7352,15 @@ index d5ecbec..0b3622e 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' @@ -7327,22 +7370,16 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# 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_LIBTOOL_CONFIG($1) + 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 --# Source file extension for Java test sources. --ac_ext=java +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_GCJ_CONFIG +*** 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 @@ -7350,9 +7387,6 @@ index d5ecbec..0b3622e 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 + ;; + *) @@ -7371,8 +7405,14 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" +-# 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 + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= @@ -7380,8 +7420,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; --# Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +-# Source file extension for RC test sources. +-ac_ext=rc + *) + 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' @@ -7392,8 +7432,9 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER +-# Object file extension for compiled RC test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= @@ -7417,9 +7458,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't @@ -7439,12 +7479,8 @@ index d5ecbec..0b3622e 100644 + fi + aix_use_runtimelinking=no --# 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]) +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" + # 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. @@ -7458,28 +7494,28 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# GCJ did not exist at the time GCC didn't implicitly link libc in. --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE + # 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. --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) +-# 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 + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -7531,7 +7567,7 @@ index d5ecbec..0b3622e 100644 -AC_LANG_RESTORE -CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_GCJ_CONFIG +-])# AC_LIBTOOL_LANG_RC_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. @@ -7588,226 +7624,6 @@ index d5ecbec..0b3622e 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 -+ bsdi[[45]]*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; - --# 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++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac -+ ;; - --# Object file extension for compiled RC test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; - --# 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 -+ ;; - --# 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 -+ # extra space). -+ freebsd2.2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# 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' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# 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' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# 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' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; - --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' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; - --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 -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ m4_if($1, [], [ -+ # Older versions of the 11.00 compiler do not understand -b yet -+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) -+ _LT_LINKER_OPTION([if $CC understands -b], -+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], -+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: - -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script @@ -7888,16 +7704,269 @@ index d5ecbec..0b3622e 100644 - 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\"\`\\\"" ++ bsdi[[45]]*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; +- 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 ++ 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"]) ++ 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 ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# `$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 , 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//" ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2.*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# 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 ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# The names of the tagged configurations supported by this script. +-available_tags= ++ 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' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _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`: ++ 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' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++ hpux11*) ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ m4_if($1, [], [ ++ # Older versions of the 11.00 compiler do not understand -b yet ++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) ++ _LT_LINKER_OPTION([if $CC understands -b], ++ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], ++ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _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 ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static + # 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 - ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ++ ;; + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + 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' @@ -7934,15 +8003,10 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=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 +-# 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) + 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 @@ -7954,12 +8018,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; --ifelse([$1], [], -- [cfgfile="${ofile}T" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- $rm -f "$cfgfile" -- AC_MSG_NOTICE([creating $ofile])], -- [cfgfile="$ofile"]) +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes @@ -7968,40 +8028,17 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -- cat <<__EOF__ >> "$cfgfile" --ifelse([$1], [], --[#! $SHELL +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os + *nto* | *qnx*) + ;; --# `$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 , 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. +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes @@ -8029,8 +8066,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# A sed program that does not truncate output. --SED=$lt_SED +-# An echo program that does not interpret backslashes. +-echo=$lt_echo + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -8039,8 +8076,9 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e 1s/^X//" +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' @@ -8054,9 +8092,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; --# 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 +-# A C compiler. +-LTCC=$lt_LTCC + 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}\*' @@ -8068,8 +8105,8 @@ index d5ecbec..0b3622e 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' --# The names of the tagged configurations supported by this script. --available_tags= +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi @@ -8077,8 +8114,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; --# ### BEGIN LIBTOOL CONFIG], --[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then @@ -8121,7 +8158,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# An ERE matcher. +-EGREP=$lt_EGREP + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o @@ -8136,8 +8174,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + sysv4) + case $host_vendor in + sni) @@ -8160,16 +8198,16 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S + 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' + ;; --# Whether or not to build static libraries. --build_old_libs=$enable_static +-# A BSD-compatible nm program. +-NM=$lt_NM + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -8180,16 +8218,16 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) +-# A symbol stripping program +-STRIP=$lt_STRIP + 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' --# 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) +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD + 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' @@ -8199,8 +8237,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" + 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 @@ -8218,10 +8256,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" + 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' @@ -8231,26 +8267,24 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os +-# Used on cygwin: assembler. +-AS="$AS" + 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 + ;; --# An echo program that does not interpret backslashes. --echo=$lt_echo +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) @@ -8263,19 +8297,19 @@ index d5ecbec..0b3622e 100644 +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no --# A C compiler. --LTCC=$lt_LTCC +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld --# A language-specific compiler. --CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) +-# Object file suffix (normally "o"). +-objext="$ac_objext" +_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]) --# Is the compiler the GNU C compiler? --with_gcc=$_LT_AC_TAGVAR(GCC, $1) +-# Old archive suffix (normally "a"). +-libext="$libext" +# +# Do we need to explicitly link libc? +# @@ -8284,8 +8318,8 @@ index d5ecbec..0b3622e 100644 + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes --# An ERE matcher. --EGREP=$lt_EGREP +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) @@ -8333,8 +8367,8 @@ index d5ecbec..0b3622e 100644 + ;; +esac --# The linker used to build libraries. --LD=$lt_[]_LT_AC_TAGVAR(LD, $1) +-# Executable file suffix (normally ""). +-exeext="$exeext" +_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], @@ -8420,42 +8454,43 @@ index d5ecbec..0b3622e 100644 +lt_save_CC="$CC" +AC_LANG_PUSH(C) --# Whether we need hard or soft links. --LN_S=$lt_LN_S +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode +# Source file extension for C test sources. +ac_ext=c --# A BSD-compatible nm program. --NM=$lt_NM +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext --# A symbol stripping program --STRIP=$lt_STRIP +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +_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 --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" +-# Do we need a version for libraries? +-need_version=$need_version +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE --# Used on cygwin: assembler. --AS="$AS" +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) @@ -8485,8 +8520,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# The name of the directory that contains temporary libtool files. --objdir=$objdir +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no @@ -8495,27 +8530,26 @@ index d5ecbec..0b3622e 100644 + esac + AC_MSG_RESULT([$enable_shared]) --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static + 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]) --# How to pass a linker flag through the compiler. --wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG --# Object file suffix (normally "o"). --objext="$ac_objext" +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) --# Old archive suffix (normally "a"). --libext="$libext" +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably @@ -8533,8 +8567,8 @@ index d5ecbec..0b3622e 100644 + _lt_caught_CXX_error=yes +fi --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= @@ -8560,14 +8594,13 @@ index d5ecbec..0b3622e 100644 +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no --# Executable file suffix (normally ""). --exeext="$exeext" +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +# Source file extension for C++ test sources. +ac_ext=cpp --# Additional compiler flags for building library objects. --pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) --pic_mode=$pic_mode +-# Library versioning type. +-version_type=$version_type +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext @@ -8615,8 +8648,8 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len +-# Format of library name prefix. +-libname_spec=$lt_libname_spec + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately @@ -8626,37 +8659,44 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec + if test "$GXX" = yes; then + # Set up default GNU C++ configuration --# Must we lock files when doing compilation? --need_locks=$lt_need_locks +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec + LT_PATH_LD --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix +-# 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 + # 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' --# Do we need a version for libraries? --need_version=$need_version +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' --# Whether dlopen is supported. --dlopen_support=$enable_dlopen +-# 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) + # 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}' --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self +-# 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 + # 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 @@ -8676,23 +8716,26 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static +-# 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) + # 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"' --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib + else + GXX=no + with_gnu_ld=no + wlarc= + fi --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $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 @@ -8726,14 +8769,16 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $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 @@ -8787,8 +8832,9 @@ index d5ecbec..0b3622e 100644 + fi + fi --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $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 @@ -8832,9 +8878,7 @@ index d5ecbec..0b3622e 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 @@ -8846,8 +8890,9 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# Format of library name prefix. --libname_spec=$lt_libname_spec +-# 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) + chorus*) + case $cc_basename in + *) @@ -8857,9 +8902,8 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# 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 +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) @@ -8934,8 +8978,8 @@ index d5ecbec..0b3622e 100644 + _LT_DARWIN_LINKER_FEATURES($1) + ;; --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd + dgux*) + case $cc_basename in + ec++*) @@ -8954,50 +8998,42 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# 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 +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; --# 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) +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; --# 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 +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval + gnu*) + ;; --# 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) +-# 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 + 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 + ;; --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9035,9 +9071,8 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $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 + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' @@ -9065,9 +9100,8 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support @@ -9118,9 +9152,8 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -9163,17 +9196,15 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler --# 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) +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $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. @@ -9249,8 +9280,8 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs + _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' @@ -9260,12 +9291,17 @@ index d5ecbec..0b3622e 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' --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd +-# 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) + 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. @@ -9315,22 +9351,24 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +-# 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) + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds +-# 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) + mvs*) + case $cc_basename in + cxx*) @@ -9344,8 +9382,9 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval +-# 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) + 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' @@ -9358,21 +9397,23 @@ index d5ecbec..0b3622e 100644 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; --# 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 +-# 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) + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; --# 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 +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes @@ -9391,8 +9432,8 @@ index d5ecbec..0b3622e 100644 + fi + ;; --# This is the shared library runtime path variable. --runpath_var=$runpath_var +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) @@ -9436,12 +9477,12 @@ index d5ecbec..0b3622e 100644 + ;; + esac --# This is the shared library path variable. --shlibpath_var=$shlibpath_var +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + _LT_TAGVAR(hardcode_libdir_separator, $1)=: --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. @@ -9480,15 +9521,15 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# How to hardcode a shared library path into an executable. --hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + sunos4*) + case $cc_basename in + CC*) @@ -9508,9 +9549,8 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# 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) +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds + solaris*) + case $cc_basename in + CC* | sunCC*) @@ -9534,14 +9574,12 @@ index d5ecbec..0b3622e 100644 + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes --# 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) +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + output_verbose_link_cmd='func_echo_all' --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $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 @@ -9552,9 +9590,9 @@ index d5ecbec..0b3622e 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' --# 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) +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; @@ -9596,18 +9634,17 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# 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) +-__EOF__ + 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' --# 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) +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -9620,9 +9657,16 @@ index d5ecbec..0b3622e 100644 + 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) +-# 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 + 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 @@ -9640,9 +9684,11 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" +- # 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) + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -9659,8 +9705,20 @@ index d5ecbec..0b3622e 100644 + esac + ;; --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) +- 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 + tandem*) + case $cc_basename in + NCC*) @@ -9675,23 +9733,22 @@ index d5ecbec..0b3622e 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 + ;; --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + @@ -9725,16 +9782,18 @@ index d5ecbec..0b3622e 100644 + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes --# Set to yes if exported symbols are required. --always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +-if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG --# The commands to list exported symbols. --export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) +- 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 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 @@ -9758,10 +9817,19 @@ index d5ecbec..0b3622e 100644 +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +# _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 @@ -9776,8 +9844,8 @@ index d5ecbec..0b3622e 100644 +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= --# Symbols that must always be exported. --include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' +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 @@ -9827,9 +9895,8 @@ index d5ecbec..0b3622e 100644 +_LT_EOF +]) --ifelse([$1],[], --[# ### END LIBTOOL CONFIG], --[# ### END LIBTOOL TAG CONFIG: $tagname]) +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; @@ -9837,39 +9904,37 @@ index d5ecbec..0b3622e 100644 +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac --__EOF__ +-# 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'" +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. --ifelse([$1],[], [ -- case $host_os in -- aix3*) -- cat <<\EOF >> "$cfgfile" +-# 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'" + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no --# 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 +-# 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'" + 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. @@ -9878,21 +9943,7 @@ index d5ecbec..0b3622e 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 @@ -9928,7 +9979,7 @@ index d5ecbec..0b3622e 100644 + fi + prev= + ;; - ++ + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up @@ -9937,11 +9988,7 @@ index d5ecbec..0b3622e 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" @@ -9956,44 +10003,21 @@ index d5ecbec..0b3622e 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 --])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - ++fi ++ +$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 @@ -10003,65 +10027,9 @@ index d5ecbec..0b3622e 100644 + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= -+ ;; - --# 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 + ;; + -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac - --# 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 -+ ;; - --# 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*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac - --# 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*) + 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'" @@ -10079,6 +10047,46 @@ index d5ecbec..0b3622e 100644 - ;; -sysv4) - symcode='[[DFNSTU]]' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac + ;; +-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 ++solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. @@ -10091,12 +10099,10 @@ index d5ecbec..0b3622e 100644 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 -- ;; +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -10129,11 +10135,8 @@ index d5ecbec..0b3622e 100644 + _lt_disable_F77=yes +fi --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[[ABCDGIRSTW]]' ;; --esac +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no @@ -10156,13 +10159,13 @@ index d5ecbec..0b3622e 100644 +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no --# Try without a prefix undercore, 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" +# Source file extension for f77 test sources. +ac_ext=f -- # 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'" +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext @@ -10179,8 +10182,8 @@ index d5ecbec..0b3622e 100644 + end +" -- # 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'" +- # Check to see that the pipe works correctly. +- pipe_works=no + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t @@ -10208,11 +10211,6 @@ index d5ecbec..0b3622e 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 < $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 @@ -10270,19 +10281,6 @@ index d5ecbec..0b3622e 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 @@ -10290,17 +10288,12 @@ index d5ecbec..0b3622e 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 <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ @@ -10309,9 +10302,13 @@ index d5ecbec..0b3622e 100644 -# define lt_ptr_t char * -# define const -#endif -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes -+fi ++# _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) -/* The mapping between symbol names and symbols. */ -const struct { @@ -10325,6 +10322,39 @@ index d5ecbec..0b3622e 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 @@ -10366,36 +10396,48 @@ index d5ecbec..0b3622e 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 +- # 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 +- AC_MSG_RESULT(ok) +-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_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_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 -+ + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ +- # C++ specific cases for pic, static, wl, etc. +- 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 @@ -10404,7 +10446,7 @@ index d5ecbec..0b3622e 100644 + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu -+ + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + @@ -10417,227 +10459,7 @@ index d5ecbec..0b3622e 100644 + + # 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 -- 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= -+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) -+ -+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 - -+AC_LANG_RESTORE - --# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) --# --------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], --[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= -+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],[ -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - -- case $host_os in + case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then @@ -10697,7 +10519,17 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -- fi ++ 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 - ;; - chorus*) - case $cc_basename in @@ -10894,7 +10726,182 @@ index d5ecbec..0b3622e 100644 - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; -- esac ++ ;; + 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 ++ ++ +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler @@ -11009,7 +11016,13 @@ index d5ecbec..0b3622e 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. @@ -11053,7 +11066,7 @@ index d5ecbec..0b3622e 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 @@ -11071,12 +11084,7 @@ index d5ecbec..0b3622e 100644 + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break - fi --], --[ -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in @@ -11494,10 +11502,15 @@ index d5ecbec..0b3622e 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 @@ -11575,21 +11588,8 @@ index d5ecbec..0b3622e 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,7 +12161,10 @@ index d5ecbec..0b3622e 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) @@ -12273,13 +12276,25 @@ index d5ecbec..0b3622e 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 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|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +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]) @@ -12298,7 +12313,17 @@ index d5ecbec..0b3622e 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 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 @@ -12318,74 +12343,6 @@ index d5ecbec..0b3622e 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 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 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. @@ -12410,8 +12367,46 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) ++# _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 - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -12432,8 +12427,8 @@ index d5ecbec..0b3622e 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_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ @@ -12445,9 +12440,8 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(ld_shlibs, $1)=no - 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.]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then @@ -12458,23 +12452,24 @@ index d5ecbec..0b3622e 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 - ;; -+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 --cflags --libs "$2" 2>&1` -+ else -+ $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 ++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 <&2 -+ m4_default([$4], [AC_MSG_ERROR( -+[Package requirements ($2) were not met: ++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` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool @@ -12482,7 +12477,8 @@ index d5ecbec..0b3622e 100644 -*** 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. -+$$1_PKG_ERRORS ++ m4_default([$4], [AC_MSG_ERROR( ++[Package requirements ($2) were not met: -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -12492,8 +12488,7 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. ++$$1_PKG_ERRORS - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' @@ -12501,14 +12496,8 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+_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. ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -12519,7 +12508,14 @@ index d5ecbec..0b3622e 100644 - fi - ;; - esac -+_PKG_TEXT ++_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. - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= @@ -12543,61 +12539,7 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; -+To get pkg-config, see .])[]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. ++_PKG_TEXT - aix4* | aix5*) - if test "$host_cpu" = ia64; then @@ -12615,7 +12557,22 @@ index d5ecbec..0b3622e 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 -+# serial 8 ++To get pkg-config, see .]) ++ ]) ++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. - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we @@ -12628,22 +12585,29 @@ index d5ecbec..0b3622e 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.12' ++[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.12.2], [], ++m4_if([$1], [1.11.6], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. @@ -12651,27 +12615,20 @@ index d5ecbec..0b3622e 100644 +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- _LT_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_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.12.2])dnl ++[AM_AUTOMAKE_VERSION([1.11.6])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 @@ -12711,11 +12668,7 @@ index d5ecbec..0b3622e 100644 - fi - fi - fi -+# 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. ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. @@ -12751,7 +12704,11 @@ index d5ecbec..0b3622e 100644 - fi - fi - ;; -+# serial 2 ++# 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. - 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)' @@ -12760,9 +12717,14 @@ index d5ecbec..0b3622e 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 @@ -12781,7 +12743,7 @@ index d5ecbec..0b3622e 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, @@ -12798,16 +12760,6 @@ index d5ecbec..0b3622e 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++. @@ -12828,7 +12780,12 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; -+# AM_CONDITIONAL -*- Autoconf -*- ++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` ++]) - darwin* | rhapsody*) - case $host_os in @@ -12879,29 +12836,42 @@ index d5ecbec..0b3622e 100644 - esac - fi - ;; -+# 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. ++# AM_CONDITIONAL -*- Autoconf -*- - 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 - ;; -+# serial 10 ++# 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. - 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 -+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++[AC_PREREQ(2.52)dnl ++ ifelse([$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 @@ -12920,22 +12890,6 @@ index d5ecbec..0b3622e 100644 +Usually this means the macro was only invoked conditionally.]]) +fi])]) -- # 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 -- ;; -+# 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' @@ -12943,7 +12897,12 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+# serial 17 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, ++# 2010, 2011 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) @@ -12952,11 +12911,7 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+# 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... ++# serial 12 - hpux9*) - if test "$GCC" = yes; then @@ -12967,16 +12922,17 @@ index d5ecbec..0b3622e 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 - -- # 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' -- ;; ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". ++# NAME is "CC", "CXX", "GCJ", or "OBJC". +# 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 @@ -12989,6 +12945,18 @@ index d5ecbec..0b3622e 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 @@ -13022,31 +12990,14 @@ index d5ecbec..0b3622e 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 @@ -13065,9 +13016,11 @@ index d5ecbec..0b3622e 100644 - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; -- esac -- fi -- ;; +- *) +- _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' + 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` @@ -13082,16 +13035,12 @@ index d5ecbec..0b3622e 100644 + *\ -arch\ *\ -arch\ *) am__universal=true ;; + 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' +- # 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 - 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 @@ -13104,29 +13053,40 @@ index d5ecbec..0b3622e 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 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -- 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" +- 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" + # 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 @@ -13145,7 +13105,7 @@ index d5ecbec..0b3622e 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} @@ -13242,7 +13202,7 @@ index d5ecbec..0b3622e 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 @@ -13264,13 +13224,9 @@ index d5ecbec..0b3622e 100644 +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE([dependency-tracking], [dnl -+AS_HELP_STRING( -+ [--enable-dependency-tracking], -+ [do not reject slow dependency extractors]) -+AS_HELP_STRING( -+ [--disable-dependency-tracking], -+ [speeds up one-time build])]) ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' @@ -13330,7 +13286,8 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+# Copyright (C) 1999-2012 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -13357,7 +13314,7 @@ index d5ecbec..0b3622e 100644 - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+# serial 6 ++#serial 5 - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -13381,7 +13338,7 @@ index d5ecbec..0b3622e 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. @@ -13393,19 +13350,21 @@ index d5ecbec..0b3622e 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'`; do ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` @@ -13440,7 +13399,7 @@ index d5ecbec..0b3622e 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], @@ -13460,7 +13419,8 @@ index d5ecbec..0b3622e 100644 - ;; +# Do all the work for Automake. -*- Autoconf -*- + -+# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -13477,7 +13437,7 @@ index d5ecbec..0b3622e 100644 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - ;; -+# serial 19 ++# serial 16 - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -13545,17 +13505,12 @@ index d5ecbec..0b3622e 100644 +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], -+[AC_DIAGNOSE([obsolete], -+[$0: two- and three-arguments forms are deprecated. 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 ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if( -+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), -+ [ok:ok],, ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [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 @@ -13605,25 +13560,20 @@ index d5ecbec..0b3622e 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([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: -+# -+# -+AC_SUBST([mkdir_p], ['$(MKDIR_P)']) ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl @@ -13634,28 +13584,21 @@ index d5ecbec..0b3622e 100644 + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES([CC])], -+ [m4_define([AC_PROG_CC], -+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES([CXX])], -+ [m4_define([AC_PROG_CXX], -+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES([OBJC])], -+ [m4_define([AC_PROG_OBJC], -+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -+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_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])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], @@ -13700,7 +13643,7 @@ index d5ecbec..0b3622e 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], @@ -13739,7 +13682,8 @@ index d5ecbec..0b3622e 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-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, ++# Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -13747,7 +13691,7 @@ index d5ecbec..0b3622e 100644 -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) -+# serial 8 ++# serial 1 -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) @@ -13767,12 +13711,12 @@ index d5ecbec..0b3622e 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-2012 Free Software Foundation, Inc. ++# 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, @@ -13856,18 +13800,18 @@ index d5ecbec..0b3622e 100644 # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 4 # AM_MAKE_INCLUDE() # ----------------- -@@ -6670,7 +9421,7 @@ AC_DEFUN([AM_MAKE_INCLUDE], +@@ -6670,7 +9366,7 @@ AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' am__doit: @@ -13876,7 +13820,7 @@ index d5ecbec..0b3622e 100644 .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -@@ -6680,24 +9431,24 @@ am__quote= +@@ -6680,24 +9376,24 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -13890,7 +13834,7 @@ index d5ecbec..0b3622e 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 @@ -13916,24 +13860,24 @@ index d5ecbec..0b3622e 100644 fi AC_SUBST([am__include]) AC_SUBST([am__quote]) -@@ -6707,14 +9458,13 @@ rm -f confinc confmf +@@ -6707,14 +9403,14 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. -+# Copyright (C) 1997-2012 Free Software Foundation, Inc. ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 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 4 -+# serial 7 ++# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ -@@ -6730,88 +9480,33 @@ AC_SUBST($1)]) +@@ -6730,7 +9426,15 @@ 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 @@ -13950,21 +13894,22 @@ index d5ecbec..0b3622e 100644 # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " - else - am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) -+ AC_MSG_WARN(['missing' script is too old or missing]) +@@ -6740,78 +9444,45 @@ else fi ]) -# Copyright (C) 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. -- --# AM_PROG_MKDIR_P --# --------------- ++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, ++# Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 1 ++ + # AM_PROG_MKDIR_P + # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories @@ -13985,7 +13930,8 @@ index d5ecbec..0b3622e 100644 -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) --AC_DEFUN([AM_PROG_MKDIR_P], ++# Check for `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 @@ -14019,22 +13965,38 @@ index d5ecbec..0b3622e 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-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software ++# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 -+# serial 6 ++# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- -@@ -6819,16 +9514,16 @@ AC_DEFUN([_AM_MANGLE_OPTION], +@@ -6819,16 +9490,16 @@ AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) @@ -14042,8 +14004,7 @@ index d5ecbec..0b3622e 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) -# ---------------------------------- @@ -14055,29 +14016,27 @@ index d5ecbec..0b3622e 100644 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- -@@ -6838,45 +9533,62 @@ AC_DEFUN([_AM_IF_OPTION], +@@ -6838,14 +9509,14 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. -+# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 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 4 -+# serial 9 ++# serial 5 # AM_SANITY_CHECK # --------------- - 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 +@@ -6854,16 +9525,29 @@ AC_DEFUN([AM_SANITY_CHECK], + # Just in case + sleep 1 + echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' @@ -14088,114 +14047,41 @@ index d5ecbec..0b3622e 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` -- if test "$[*]" = "X"; then -- # -L didn't work. ++ 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 -- 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]) ++ 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 --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 -+]) + AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001-2012 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -+# serial 2 ++# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- --# 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'. + # 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'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi @@ -14203,7 +14089,7 @@ index d5ecbec..0b3622e 100644 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+# Copyright (C) 2006-2012 Free Software Foundation, Inc. ++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -14225,24 +14111,11 @@ index d5ecbec..0b3622e 100644 # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2004-2012 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, - # 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])]) +@@ -6940,10 +9645,11 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], @@ -14257,1039 +14130,6 @@ index d5ecbec..0b3622e 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/config.guess b/build/config.guess -index 5e4f2a8..c0adba9 100755 ---- a/build/config.guess -+++ b/build/config.guess -@@ -1,11 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2010-09-24-OpenLDAP' --# $OpenLDAP$ -+timestamp='2012-06-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -18,9 +17,7 @@ timestamp='2010-09-24-OpenLDAP' - # 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. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -58,8 +55,8 @@ GNU config.guess ($timestamp) - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -93,7 +90,7 @@ if test $# != 0; then - exit 1 - fi - --trap 'exit 1' HUP INT TERM -+trap 'exit 1' 1 2 15 - - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a - # compiler to aid in system detection is discouraged as it requires -@@ -107,7 +104,7 @@ trap 'exit 1' HUP INT TERM - - set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; --trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -@@ -146,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -182,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -225,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -271,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -297,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -@@ -396,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -482,8 +482,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -496,7 +496,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -596,52 +596,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -+ #define _HPUX_SOURCE -+ #include -+ #include - -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -732,22 +732,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -771,14 +771,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -790,13 +790,12 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) -@@ -805,15 +804,18 @@ EOF - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -859,6 +861,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -868,7 +877,7 @@ EOF - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -@@ -880,20 +889,29 @@ EOF - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -935,7 +953,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -961,7 +979,7 @@ EOF - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -970,16 +988,16 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-tilera-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -988,11 +1006,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1024,7 +1042,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1052,13 +1070,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1093,8 +1111,8 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1137,10 +1155,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1166,11 +1184,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1238,7 +1256,7 @@ EOF - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1283,13 +1301,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1307,6 +1325,9 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1329,11 +1350,11 @@ main () - #include - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff --git a/build/config.sub b/build/config.sub -index 00e00c4..6205f84 100755 ---- a/build/config.sub -+++ b/build/config.sub -@@ -1,11 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2010-12-11-OpenLDAP' --# $OpenLDAP$ -+timestamp='2012-04-18' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -22,9 +21,7 @@ timestamp='2010-12-11-OpenLDAP' - # 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. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -77,8 +74,8 @@ version="\ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -133,6 +130,10 @@ case $maybe_os in - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -159,8 +160,8 @@ case $os in - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -176,10 +177,10 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -224,6 +225,12 @@ case $os in - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -248,17 +255,22 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ -@@ -287,22 +299,23 @@ case $basic_machine in - | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -@@ -315,8 +328,7 @@ case $basic_machine in - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -326,6 +338,21 @@ case $basic_machine in - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -340,11 +367,13 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -353,8 +382,10 @@ case $basic_machine in - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -@@ -383,24 +414,26 @@ case $basic_machine in - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -425,7 +458,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -508,7 +541,7 @@ case $basic_machine in - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -698,7 +731,6 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -756,7 +788,7 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze) - basic_machine=microblaze-xilinx - ;; - mingw32) -@@ -795,10 +827,18 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -863,10 +903,10 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -- neo-tandem) -+ neo-tandem) - basic_machine=neo-tandem - ;; -- nse-tandem) -+ nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) -@@ -951,9 +991,10 @@ case $basic_machine in - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -1047,6 +1088,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1103,13 +1147,8 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1179,6 +1218,9 @@ case $basic_machine in - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1276,11 +1318,11 @@ esac - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1316,7 +1358,7 @@ case $os in - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ -@@ -1365,7 +1407,7 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1414,7 +1456,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1459,8 +1501,8 @@ case $os in - -dicos*) - os=-dicos - ;; -- -nacl*) -- ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1483,10 +1525,10 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1498,8 +1540,11 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf - ;; - tic54x-*) - os=-coff -@@ -1528,14 +1573,11 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1562,7 +1604,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) diff --git a/build/ltmain.sh b/build/ltmain.sh old mode 100755 new mode 100644 @@ -30829,469 +29669,30 @@ index 5593a2e..63ae69d # End: +# vi:sw=2 + -diff --git a/build/missing b/build/missing -index 4423615..9a55648 100755 ---- a/build/missing -+++ b/build/missing -@@ -1,8 +1,9 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. - --# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. -+scriptversion=2012-01-06.18; # UTC -+ -+# Copyright (C) 1996-2012 Free Software Foundation, Inc. - # Originally by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify -@@ -16,38 +17,23 @@ - # 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. -+# along with this program. If not, see . - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# This file is distributed with OpenLDAP Software, which contains a --# configuration script generated by Autoconf, and is distributable --# under the same distributions terms as OpenLDAP itself. -- --## Copyright 1998-2012 The OpenLDAP Foundation. --## All rights reserved. --## --## Redistribution and use in source and binary forms, with or without --## modification, are permitted only as authorized by the OpenLDAP --## Public License. --## --## A copy of this license is available in the file LICENSE in the --## top-level directory of the distribution or, alternatively, at --## -- - if test $# -eq 0; then -- echo 1>&2 "Try \`$0 --help' for more information" -+ echo 1>&2 "Try '$0 --help' for more information" - exit 1 - fi - - run=: -+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -+sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - --# In the cases where this matters, `missing' is being run in the -+# In the cases where this matters, 'missing' is being run in the - # srcdir already. - if test -f configure.ac; then - configure_ac=configure.ac -@@ -57,7 +43,7 @@ fi - - msg="missing on your system" - --case "$1" in -+case $1 in - --run) - # Try to run requested program, and just exit if it succeeds. - run= -@@ -78,7 +64,7 @@ case "$1" in - echo "\ - $0 [OPTION]... PROGRAM [ARGUMENT]... - --Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an - error status if there is no known handling for PROGRAM. - - Options: -@@ -87,17 +73,20 @@ Options: - --run try to run the given command, and emulate it if it fails - - Supported PROGRAM values: -- aclocal touch file \`aclocal.m4' -- autoconf touch file \`configure' -- autoheader touch file \`config.h.in' -- automake touch all \`Makefile.in' files -- bison create \`y.tab.[ch]', if possible, from existing .[ch] -- flex create \`lex.yy.c', if possible, from existing .c -+ aclocal touch file 'aclocal.m4' -+ autoconf touch file 'configure' -+ autoheader touch file 'config.h.in' -+ autom4te touch the output file, or create a stub one -+ automake touch all 'Makefile.in' files -+ bison create 'y.tab.[ch]', if possible, from existing .[ch] -+ flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file -- lex create \`lex.yy.c', if possible, from existing .c -+ lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file -- tar try tar, gnutar, gtar, then tar without non-portable flags -- yacc create \`y.tab.[ch]', if possible, from existing .[ch] -+ yacc create 'y.tab.[ch]', if possible, from existing .[ch] -+ -+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -+'g' are ignored when checking the name. - - Send bug reports to ." - exit $? -@@ -109,37 +98,35 @@ Send bug reports to ." - ;; - - -*) -- echo 1>&2 "$0: Unknown \`$1' option" -- echo 1>&2 "Try \`$0 --help' for more information" -+ echo 1>&2 "$0: Unknown '$1' option" -+ echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - - esac - -+# normalize program name to check for. -+program=`echo "$1" | sed ' -+ s/^gnu-//; t -+ s/^gnu//; t -+ s/^g//; t'` -+ - # Now exit if we have it, but it failed. Also exit now if we - # don't have it and --version was passed (most likely to detect --# the program). --case "$1" in -- lex|yacc) -+# the program). This is about non-GNU programs, so use $1 not -+# $program. -+case $1 in -+ lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - -- tar) -- if test -n "$run"; then -- echo 1>&2 "ERROR: \`tar' requires --run" -- exit 1 -- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -- exit 1 -- fi -- ;; -- - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone -- # running `$TOOL --version' or `$TOOL --help' to check whether -+ # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi -@@ -148,36 +135,36 @@ esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. --case "$1" in -+case $program in - aclocal*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`acinclude.m4' or \`${configure_ac}'. You might want -- to install the \`Automake' and \`Perl' packages. Grab them from -+WARNING: '$1' is $msg. You should only need it if -+ you modified 'acinclude.m4' or '${configure_ac}'. You might want -+ to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - -- autoconf) -+ autoconf*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`${configure_ac}'. You might want to install the -- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU -+WARNING: '$1' is $msg. You should only need it if -+ you modified '${configure_ac}'. You might want to install the -+ Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - -- autoheader) -+ autoheader*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`acconfig.h' or \`${configure_ac}'. You might want -- to install the \`Autoconf' and \`GNU m4' packages. Grab them -+WARNING: '$1' is $msg. You should only need it if -+ you modified 'acconfig.h' or '${configure_ac}'. You might want -+ to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do -- case "$f" in -+ case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; -@@ -188,25 +175,25 @@ WARNING: \`$1' is $msg. You should only need it if - - automake*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. -- You might want to install the \`Automake' and \`Perl' packages. -+WARNING: '$1' is $msg. You should only need it if -+ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. -+ You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - -- autom4te) -+ autom4te*) - echo 1>&2 "\ --WARNING: \`$1' is needed, but is $msg. -+WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. -- You can get \`$1' as part of \`Autoconf' from any GNU -+ You can get '$1' as part of Autoconf from any GNU - archive site." - -- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` -- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else -@@ -220,93 +207,97 @@ WARNING: \`$1' is needed, but is $msg. - fi - ;; - -- bison|yacc) -+ bison*|yacc*) - echo 1>&2 "\ --WARNING: \`$1' $msg. You should only need it if -- you modified a \`.y' file. You may need the \`Bison' package -+WARNING: '$1' $msg. You should only need it if -+ you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get -- \`Bison' from any GNU archive site." -+ Bison from any GNU archive site." - rm -f y.tab.c y.tab.h -- if [ $# -ne 1 ]; then -- eval LASTARG="\${$#}" -- case "$LASTARG" in -+ if test $# -ne 1; then -+ eval LASTARG=\${$#} -+ case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi -- if [ ! -f y.tab.h ]; then -+ if test ! -f y.tab.h; then - echo >y.tab.h - fi -- if [ ! -f y.tab.c ]; then -+ if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - -- lex|flex) -+ lex*|flex*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified a \`.l' file. You may need the \`Flex' package -+WARNING: '$1' is $msg. You should only need it if -+ you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get -- \`Flex' from any GNU archive site." -+ Flex from any GNU archive site." - rm -f lex.yy.c -- if [ $# -ne 1 ]; then -- eval LASTARG="\${$#}" -- case "$LASTARG" in -+ if test $# -ne 1; then -+ eval LASTARG=\${$#} -+ case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi -- if [ ! -f lex.yy.c ]; then -+ if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - -- help2man) -+ help2man*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -+WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the -- \`Help2man' package in order for those modifications to take -- effect. You can get \`Help2man' from any GNU archive site." -+ Help2man package in order for those modifications to take -+ effect. You can get Help2man from any GNU archive site." - -- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` -- if test -z "$file"; then -- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` -- fi -- if [ -f "$file" ]; then -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -+ if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" -- exit 1 -+ exit $? - fi - ;; - -- makeinfo) -+ makeinfo*) - echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified a \`.texi' or \`.texinfo' file, or any other file -+WARNING: '$1' is $msg. You should only need it if -+ you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious -- call might also be the consequence of using a buggy \`make' (AIX, -- DU, IRIX). You might want to install the \`Texinfo' package or -- the \`GNU make' package. Grab either from any GNU archive site." -+ call might also be the consequence of using a buggy 'make' (AIX, -+ DU, IRIX). You might want to install the Texinfo package or -+ the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... -- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` -+ file=`sed -n ' -+ /^@setfilename/{ -+ s/.* \([^ ]*\) *$/\1/ -+ p -+ q -+ }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi -@@ -316,49 +307,14 @@ WARNING: \`$1' is $msg. You should only need it if - touch $file - ;; - -- tar) -- shift -- -- # We have already tried tar in the generic part. -- # Look for gnutar/gtar before invocation to avoid ugly error -- # messages. -- if (gnutar --version > /dev/null 2>&1); then -- gnutar "$@" && exit 0 -- fi -- if (gtar --version > /dev/null 2>&1); then -- gtar "$@" && exit 0 -- fi -- firstarg="$1" -- if shift; then -- case "$firstarg" in -- *o*) -- firstarg=`echo "$firstarg" | sed s/o//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- case "$firstarg" in -- *h*) -- firstarg=`echo "$firstarg" | sed s/h//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- fi -- -- echo 1>&2 "\ --WARNING: I can't seem to be able to run \`tar' with the given arguments. -- You may want to install GNU tar or Free paxutils, or check the -- command line arguments." -- exit 1 -- ;; -- - *) - echo 1>&2 "\ --WARNING: \`$1' is needed, and is $msg. -+WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the -- proper tools for further handling them. Check the \`README' file, -+ proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case -- some other package would contain this missing \`$1' program." -+ some other package would contain this missing '$1' program." - exit 1 - ;; - esac -@@ -369,5 +325,6 @@ exit 0 - # eval: (add-hook 'write-file-hooks 'time-stamp) - # time-stamp-start: "scriptversion=" - # time-stamp-format: "%:y-%02m-%02d.%02H" --# time-stamp-end: "$" -+# time-stamp-time-zone: "UTC" -+# time-stamp-end: "; # UTC" - # End: diff --git a/configure b/configure -index a9c2177..db327e8 100755 +index e4c8adc..6d19a92 100755 --- a/configure +++ b/configure -@@ -1,15 +1,13 @@ +@@ -1,15 +1,15 @@ #! /bin/sh - # From configure.in Id: 5d7d475f16befcc240afc953c9a8775677566d23 . + # From configure.in Id: 792cf0cd7da87fae39dca56961bcad11cf8b3d38 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. -+# Generated by GNU Autoconf 2.69. ++# Generated by GNU Autoconf 2.68. # # Copyright 1998-2012 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. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation -@@ -93,6 +91,7 @@ fi +@@ -93,6 +93,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -31299,46 +29700,7 @@ index a9c2177..db327e8 100755 case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -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 +@@ -175,6 +176,14 @@ test x\$exitcode = x0 || exit 1" 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 @@ -31353,41 +29715,27 @@ index a9c2177..db327e8 100755 test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -@@ -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 +@@ -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 - exec "$CONFIG_SHELL" "$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 ++ 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+"$@"} fi if test x$as_have_required = xno; then : -@@ -321,10 +365,18 @@ $as_echo X"$as_dir" | +@@ -321,7 +337,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -31396,18 +29744,7 @@ index a9c2177..db327e8 100755 } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -361,19 +413,19 @@ else +@@ -361,19 +377,19 @@ else fi # as_fn_arith @@ -31435,70 +29772,7 @@ index a9c2177..db327e8 100755 as_fn_exit $as_status } # as_fn_error -@@ -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'" +@@ -530,162 +546,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'" @@ -31662,7 +29936,7 @@ index a9c2177..db327e8 100755 # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -@@ -748,7 +636,9 @@ ac_includes_default="\ +@@ -748,7 +616,9 @@ ac_includes_default="\ # include #endif" @@ -31673,7 +29947,7 @@ index a9c2177..db327e8 100755 SLAPD_SQL_INCLUDES SLAPD_SQL_LIBS SLAPD_SQL_LDFLAGS -@@ -832,22 +722,36 @@ LIBSRCS +@@ -832,22 +702,36 @@ LIBSRCS LIBOBJS MYSQL LTSTATIC @@ -31715,7 +29989,7 @@ index a9c2177..db327e8 100755 AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -@@ -860,6 +764,10 @@ ac_ct_CC +@@ -860,6 +744,10 @@ ac_ct_CC CPPFLAGS LDFLAGS CFLAGS @@ -31726,7 +30000,7 @@ index a9c2177..db327e8 100755 AR CC ldap_subdir -@@ -874,6 +782,7 @@ am__leading_dot +@@ -874,6 +762,7 @@ am__leading_dot SET_MAKE AWK mkdir_p @@ -31734,7 +30008,7 @@ index a9c2177..db327e8 100755 INSTALL_STRIP_PROGRAM STRIP install_sh -@@ -885,6 +794,7 @@ ACLOCAL +@@ -885,6 +774,7 @@ ACLOCAL VERSION PACKAGE CYGPATH_W @@ -31742,7 +30016,7 @@ index a9c2177..db327e8 100755 INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -@@ -1011,12 +921,12 @@ enable_valsort +@@ -1011,12 +901,12 @@ enable_valsort enable_xxliboptions enable_static enable_shared @@ -31757,7 +30031,7 @@ index a9c2177..db327e8 100755 with_xxinstall ' ac_precious_vars='build_alias -@@ -1027,7 +937,12 @@ CFLAGS +@@ -1027,7 +917,12 @@ CFLAGS LDFLAGS LIBS CPPFLAGS @@ -31771,7 +30045,7 @@ index a9c2177..db327e8 100755 # Initialize some variables set by options. -@@ -1090,8 +1005,9 @@ do +@@ -1090,8 +985,9 @@ do fi case $ac_option in @@ -31783,7 +30057,7 @@ index a9c2177..db327e8 100755 esac # Accept the important Cygnus configure options, so we can diagnose typos. -@@ -1136,7 +1052,7 @@ do +@@ -1136,7 +1032,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 && @@ -31792,7 +30066,7 @@ index a9c2177..db327e8 100755 ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1162,7 +1078,7 @@ do +@@ -1162,7 +1058,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 && @@ -31801,7 +30075,7 @@ index a9c2177..db327e8 100755 ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1366,7 +1282,7 @@ do +@@ -1366,7 +1262,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 && @@ -31810,7 +30084,7 @@ index a9c2177..db327e8 100755 ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1382,7 +1298,7 @@ do +@@ -1382,7 +1278,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 && @@ -31819,7 +30093,7 @@ index a9c2177..db327e8 100755 ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1412,8 +1328,8 @@ do +@@ -1412,8 +1308,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -31830,7 +30104,7 @@ index a9c2177..db327e8 100755 ;; *=*) -@@ -1421,7 +1337,7 @@ Try \`$0 --help' for more information." +@@ -1421,7 +1317,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]* ) @@ -31839,7 +30113,7 @@ index a9c2177..db327e8 100755 esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1431,7 +1347,7 @@ Try \`$0 --help' for more information." +@@ -1431,7 +1327,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 @@ -31848,7 +30122,7 @@ index a9c2177..db327e8 100755 ;; esac -@@ -1439,13 +1355,13 @@ done +@@ -1439,13 +1335,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -31864,7 +30138,7 @@ index a9c2177..db327e8 100755 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1468,7 +1384,7 @@ do +@@ -1468,7 +1364,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -31873,16 +30147,18 @@ index a9c2177..db327e8 100755 done # There might be people who depend on the old broken behavior: `$host' -@@ -1482,8 +1398,6 @@ target=$target_alias +@@ -1482,8 +1378,8 @@ 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 +1412,9 @@ test "$silent" = yes && exec 6>/dev/null +@@ -1498,9 +1394,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 .` || @@ -31894,7 +30170,7 @@ index a9c2177..db327e8 100755 # Find the source files, if location was not specified. -@@ -1539,11 +1453,11 @@ else +@@ -1539,11 +1435,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -31908,7 +30184,7 @@ index a9c2177..db327e8 100755 pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1583,7 +1497,7 @@ Configuration: +@@ -1583,7 +1479,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 @@ -31917,20 +30193,7 @@ index a9c2177..db327e8 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 -@@ -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: +@@ -1729,10 +1625,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] @@ -31945,7 +30208,7 @@ index a9c2177..db327e8 100755 See INSTALL file for further details. -@@ -1745,6 +1662,14 @@ Some influential environment variables: +@@ -1745,6 +1642,14 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -31960,19 +30223,19 @@ index a9c2177..db327e8 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 +1738,9 @@ test -n "$ac_init_help" && exit $ac_status +@@ -1813,9 +1718,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.69 ++generated by GNU Autoconf 2.68 -Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. ++Copyright (C) 2010 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 +1787,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -1862,7 +1767,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi @@ -31981,16 +30244,7 @@ index a9c2177..db327e8 100755 as_fn_set_status $ac_retval } # ac_fn_c_try_compile -@@ -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 +@@ -1908,11 +1813,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 @@ -32034,7 +30288,7 @@ index a9c2177..db327e8 100755 # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. -@@ -1934,7 +1890,7 @@ $as_echo "$ac_try_echo"; } >&5 +@@ -1934,7 +1870,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -32043,7 +30297,7 @@ index a9c2177..db327e8 100755 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : -@@ -1945,104 +1901,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -1945,104 +1881,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi @@ -32149,7 +30403,7 @@ index a9c2177..db327e8 100755 # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -@@ -2080,42 +1943,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -2080,42 +1923,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo @@ -32193,7 +30447,7 @@ index a9c2177..db327e8 100755 # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly -@@ -2124,7 +1956,7 @@ ac_fn_c_check_func () +@@ -2124,7 +1936,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; } @@ -32202,7 +30456,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -2179,37 +2011,128 @@ fi +@@ -2179,47 +1991,138 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -32255,6 +30509,16 @@ index a9c2177..db327e8 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 @@ -32346,10 +30610,20 @@ index a9c2177..db327e8 100755 +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $4 - int -@@ -2233,7 +2156,7 @@ fi ++/* 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 eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -32358,7 +30632,7 @@ index a9c2177..db327e8 100755 } # ac_fn_c_check_type -@@ -2246,7 +2169,7 @@ ac_fn_c_check_member () +@@ -2246,7 +2149,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; } @@ -32367,7 +30641,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -2290,7 +2213,7 @@ fi +@@ -2290,7 +2193,7 @@ fi eval ac_res=\$$4 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -32376,57 +30650,7 @@ index a9c2177..db327e8 100755 } # ac_fn_c_check_member -@@ -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 \ +@@ -2467,7 +2370,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi @@ -32435,16 +30659,16 @@ index a9c2177..db327e8 100755 as_fn_set_status $ac_retval } # ac_fn_c_compute_int -@@ -2476,7 +2404,7 @@ This file contains any messages produced by compilers while +@@ -2476,7 +2379,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.69. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ -@@ -2586,11 +2514,9 @@ trap 'exit_status=$? +@@ -2586,11 +2489,9 @@ trap 'exit_status=$? { echo @@ -32458,7 +30682,7 @@ index a9c2177..db327e8 100755 echo # The following way of writing the cache mishandles newlines in values, ( -@@ -2624,11 +2550,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +@@ -2624,11 +2525,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo @@ -32472,7 +30696,7 @@ index a9c2177..db327e8 100755 echo for ac_var in $ac_subst_vars do -@@ -2641,11 +2565,9 @@ _ASBOX +@@ -2641,11 +2540,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then @@ -32486,7 +30710,7 @@ index a9c2177..db327e8 100755 echo for ac_var in $ac_subst_files do -@@ -2659,11 +2581,9 @@ _ASBOX +@@ -2659,11 +2556,9 @@ _ASBOX fi if test -s confdefs.h; then @@ -32500,7 +30724,7 @@ index a9c2177..db327e8 100755 echo cat confdefs.h echo -@@ -2718,7 +2638,12 @@ _ACEOF +@@ -2718,7 +2613,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then @@ -32514,7 +30738,7 @@ index a9c2177..db327e8 100755 elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site -@@ -2733,7 +2658,11 @@ do +@@ -2733,7 +2633,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 @@ -32527,7 +30751,7 @@ index a9c2177..db327e8 100755 fi done -@@ -2793,7 +2722,7 @@ if $ac_cache_corrupted; then +@@ -2793,7 +2697,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;} @@ -32536,7 +30760,7 @@ index a9c2177..db327e8 100755 fi ## -------------------- ## ## Main body of script. ## -@@ -2834,16 +2763,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -2834,16 +2738,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in build "$srcdir"/build; do @@ -32567,7 +30791,7 @@ index a9c2177..db327e8 100755 fi # These three variables are undocumented and unsupported, -@@ -2857,13 +2792,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +@@ -2857,13 +2767,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 @@ -32583,7 +30807,7 @@ index a9c2177..db327e8 100755 fi SHTOOL="$ac_cv_shtool" -@@ -2885,27 +2820,27 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_REPO}..." +@@ -2885,27 +2795,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 || @@ -32616,7 +30840,7 @@ index a9c2177..db327e8 100755 esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2923,14 +2858,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +@@ -2923,14 +2833,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; } @@ -32633,7 +30857,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -2938,7 +2873,7 @@ fi +@@ -2938,7 +2848,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; @@ -32642,7 +30866,7 @@ index a9c2177..db327e8 100755 esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2956,14 +2891,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +@@ -2956,14 +2866,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; } @@ -32659,7 +30883,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -2971,7 +2906,7 @@ fi +@@ -2971,7 +2881,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; @@ -32668,17 +30892,17 @@ index a9c2177..db327e8 100755 esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' -@@ -2994,7 +2929,8 @@ test -n "$target_alias" && +@@ -2994,7 +2904,8 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version="1.9" -+am__api_version='1.12' ++am__api_version='1.11' + # 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 +2948,7 @@ am__api_version="1.9" +@@ -3012,7 +2923,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 @@ -32687,23 +30911,10 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -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 +@@ -3093,16 +3004,29 @@ $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' @@ -32714,60 +30925,34 @@ index a9c2177..db327e8 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` -- if test "$*" = "X"; then -- # -L didn't work. ++ 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 -- 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". ++ 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". - as_fn_error "ls -t appears to fail. Make sure there is not a broken --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 ++ 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 # Ok. : else @@ -32776,21 +30961,7 @@ index a9c2177..db327e8 100755 Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -+# If we didn't sleep, we still need to ensure time stamps of config.status and -+# generated files are strictly newer. -+am_sleep_pid= -+if grep 'slept: no' conftest.file >/dev/null 2>&1; then -+ ( sleep 1 ) & -+ am_sleep_pid=$! -+fi -+ -+rm -f conftest.file -+ - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. -@@ -3140,48 +3104,173 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +@@ -3140,7 +3064,14 @@ 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` @@ -32806,12 +30977,10 @@ index a9c2177..db327e8 100755 # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " - 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 -- +@@ -3150,38 +3081,162 @@ else + $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 @@ -32836,10 +31005,6 @@ index a9c2177..db327e8 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 + *\ * | *\ *) @@ -32849,10 +31014,10 @@ index a9c2177..db327e8 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. @@ -32871,7 +31036,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -32911,7 +31076,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -32962,7 +31127,7 @@ index a9c2177..db327e8 100755 + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do -+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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) '* | \ @@ -32994,10 +31159,16 @@ index a9c2177..db327e8 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 +3278,7 @@ do +@@ -3189,7 +3244,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; } @@ -33006,16 +31177,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -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 +@@ -3229,7 +3284,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'` @@ -33024,7 +31186,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -3237,7 +3326,7 @@ SHELL = /bin/sh +@@ -3237,7 +3292,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF @@ -33033,7 +31195,7 @@ index a9c2177..db327e8 100755 case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; -@@ -3265,10 +3354,14 @@ else +@@ -3265,10 +3320,14 @@ else fi rmdir .tst 2>/dev/null @@ -33052,20 +31214,17 @@ index a9c2177..db327e8 100755 fi # test whether we have cygpath -@@ -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"} +@@ -3302,115 +3361,13 @@ 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 @@ -33165,27 +31324,19 @@ index a9c2177..db327e8 100755 - -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+# For better backward compatibility. To be removed once Automake 1.9.x -+# dies out for good. For more background, see: -+# -+# -+mkdir_p='$(MKDIR_P)' - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. +- +-# We need awk for the "check" target. 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 +3501,7 @@ if test "${enable_debug+set}" = set; then : +@@ -3503,7 +3460,7 @@ if test "${enable_debug+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33194,7 +31345,7 @@ index a9c2177..db327e8 100755 fi ol_enable_debug="$ol_arg" -@@ -3524,7 +3522,7 @@ if test "${enable_dynamic+set}" = set; then : +@@ -3524,7 +3481,7 @@ if test "${enable_dynamic+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33203,7 +31354,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dynamic="$ol_arg" -@@ -3545,7 +3543,7 @@ if test "${enable_syslog+set}" = set; then : +@@ -3545,7 +3502,7 @@ if test "${enable_syslog+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33212,7 +31363,7 @@ index a9c2177..db327e8 100755 fi ol_enable_syslog="$ol_arg" -@@ -3566,7 +3564,7 @@ if test "${enable_proctitle+set}" = set; then : +@@ -3566,7 +3523,7 @@ if test "${enable_proctitle+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33221,7 +31372,7 @@ index a9c2177..db327e8 100755 fi ol_enable_proctitle="$ol_arg" -@@ -3588,7 +3586,7 @@ if test "${enable_ipv6+set}" = set; then : +@@ -3588,7 +3545,7 @@ if test "${enable_ipv6+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33230,7 +31381,7 @@ index a9c2177..db327e8 100755 fi ol_enable_ipv6="$ol_arg" -@@ -3609,7 +3607,7 @@ if test "${enable_local+set}" = set; then : +@@ -3609,7 +3566,7 @@ if test "${enable_local+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33239,7 +31390,7 @@ index a9c2177..db327e8 100755 fi ol_enable_local="$ol_arg" -@@ -3631,7 +3629,7 @@ if test "${with_cyrus_sasl+set}" = set; then : +@@ -3631,7 +3588,7 @@ if test "${with_cyrus_sasl+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33248,7 +31399,7 @@ index a9c2177..db327e8 100755 fi ol_with_cyrus_sasl="$ol_arg" -@@ -3652,7 +3650,7 @@ if test "${with_fetch+set}" = set; then : +@@ -3652,7 +3609,7 @@ if test "${with_fetch+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33257,7 +31408,7 @@ index a9c2177..db327e8 100755 fi ol_with_fetch="$ol_arg" -@@ -3673,7 +3671,7 @@ if test "${with_threads+set}" = set; then : +@@ -3673,7 +3630,7 @@ if test "${with_threads+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33266,7 +31417,7 @@ index a9c2177..db327e8 100755 fi ol_with_threads="$ol_arg" -@@ -3694,7 +3692,7 @@ if test "${with_tls+set}" = set; then : +@@ -3694,7 +3651,7 @@ if test "${with_tls+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33275,7 +31426,7 @@ index a9c2177..db327e8 100755 fi ol_with_tls="$ol_arg" -@@ -3715,7 +3713,7 @@ if test "${with_yielding_select+set}" = set; then : +@@ -3715,7 +3672,7 @@ if test "${with_yielding_select+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33284,7 +31435,7 @@ index a9c2177..db327e8 100755 fi ol_with_yielding_select="$ol_arg" -@@ -3736,7 +3734,7 @@ if test "${with_mp+set}" = set; then : +@@ -3736,7 +3693,7 @@ if test "${with_mp+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33293,7 +31444,7 @@ index a9c2177..db327e8 100755 fi ol_with_mp="$ol_arg" -@@ -3757,7 +3755,7 @@ if test "${with_odbc+set}" = set; then : +@@ -3757,7 +3714,7 @@ if test "${with_odbc+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33302,7 +31453,7 @@ index a9c2177..db327e8 100755 fi ol_with_odbc="$ol_arg" -@@ -3785,7 +3783,7 @@ if test "${enable_slapd+set}" = set; then : +@@ -3785,7 +3742,7 @@ if test "${enable_slapd+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33311,7 +31462,7 @@ index a9c2177..db327e8 100755 fi ol_enable_slapd="$ol_arg" -@@ -3806,7 +3804,7 @@ if test "${enable_dynacl+set}" = set; then : +@@ -3806,7 +3763,7 @@ if test "${enable_dynacl+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33320,7 +31471,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dynacl="$ol_arg" -@@ -3827,7 +3825,7 @@ if test "${enable_aci+set}" = set; then : +@@ -3827,7 +3784,7 @@ if test "${enable_aci+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33329,7 +31480,7 @@ index a9c2177..db327e8 100755 fi ol_enable_aci="$ol_arg" -@@ -3848,7 +3846,7 @@ if test "${enable_cleartext+set}" = set; then : +@@ -3848,7 +3805,7 @@ if test "${enable_cleartext+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33338,7 +31489,7 @@ index a9c2177..db327e8 100755 fi ol_enable_cleartext="$ol_arg" -@@ -3869,7 +3867,7 @@ if test "${enable_crypt+set}" = set; then : +@@ -3869,7 +3826,7 @@ if test "${enable_crypt+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33347,7 +31498,7 @@ index a9c2177..db327e8 100755 fi ol_enable_crypt="$ol_arg" -@@ -3890,7 +3888,7 @@ if test "${enable_lmpasswd+set}" = set; then : +@@ -3890,7 +3847,7 @@ if test "${enable_lmpasswd+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33356,7 +31507,7 @@ index a9c2177..db327e8 100755 fi ol_enable_lmpasswd="$ol_arg" -@@ -3911,7 +3909,7 @@ if test "${enable_spasswd+set}" = set; then : +@@ -3911,7 +3868,7 @@ if test "${enable_spasswd+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33365,7 +31516,7 @@ index a9c2177..db327e8 100755 fi ol_enable_spasswd="$ol_arg" -@@ -3932,7 +3930,7 @@ if test "${enable_modules+set}" = set; then : +@@ -3932,7 +3889,7 @@ if test "${enable_modules+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33374,7 +31525,7 @@ index a9c2177..db327e8 100755 fi ol_enable_modules="$ol_arg" -@@ -3953,7 +3951,7 @@ if test "${enable_rewrite+set}" = set; then : +@@ -3953,7 +3910,7 @@ if test "${enable_rewrite+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33383,7 +31534,7 @@ index a9c2177..db327e8 100755 fi ol_enable_rewrite="$ol_arg" -@@ -3974,7 +3972,7 @@ if test "${enable_rlookups+set}" = set; then : +@@ -3974,7 +3931,7 @@ if test "${enable_rlookups+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33392,7 +31543,7 @@ index a9c2177..db327e8 100755 fi ol_enable_rlookups="$ol_arg" -@@ -3995,7 +3993,7 @@ if test "${enable_slapi+set}" = set; then : +@@ -3995,7 +3952,7 @@ if test "${enable_slapi+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33401,7 +31552,7 @@ index a9c2177..db327e8 100755 fi ol_enable_slapi="$ol_arg" -@@ -4016,7 +4014,7 @@ if test "${enable_slp+set}" = set; then : +@@ -4016,7 +3973,7 @@ if test "${enable_slp+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33410,7 +31561,7 @@ index a9c2177..db327e8 100755 fi ol_enable_slp="$ol_arg" -@@ -4037,7 +4035,7 @@ if test "${enable_wrappers+set}" = set; then : +@@ -4037,7 +3994,7 @@ if test "${enable_wrappers+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33419,7 +31570,7 @@ index a9c2177..db327e8 100755 fi ol_enable_wrappers="$ol_arg" -@@ -4081,7 +4079,7 @@ if test "${enable_backends+set}" = set; then : +@@ -4081,7 +4038,7 @@ if test "${enable_backends+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33428,7 +31579,7 @@ index a9c2177..db327e8 100755 fi ol_enable_backends="$ol_arg" -@@ -4100,7 +4098,7 @@ if test "${enable_bdb+set}" = set; then : +@@ -4100,7 +4057,7 @@ if test "${enable_bdb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33437,7 +31588,7 @@ index a9c2177..db327e8 100755 fi ol_enable_bdb="$ol_arg" -@@ -4121,7 +4119,7 @@ if test "${enable_dnssrv+set}" = set; then : +@@ -4121,7 +4078,7 @@ if test "${enable_dnssrv+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33446,7 +31597,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dnssrv="$ol_arg" -@@ -4142,7 +4140,7 @@ if test "${enable_hdb+set}" = set; then : +@@ -4142,7 +4099,7 @@ if test "${enable_hdb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33455,7 +31606,7 @@ index a9c2177..db327e8 100755 fi ol_enable_hdb="$ol_arg" -@@ -4163,7 +4161,7 @@ if test "${enable_ldap+set}" = set; then : +@@ -4163,7 +4120,7 @@ if test "${enable_ldap+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33464,7 +31615,7 @@ index a9c2177..db327e8 100755 fi ol_enable_ldap="$ol_arg" -@@ -4184,7 +4182,7 @@ if test "${enable_mdb+set}" = set; then : +@@ -4184,7 +4141,7 @@ if test "${enable_mdb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33473,7 +31624,7 @@ index a9c2177..db327e8 100755 fi ol_enable_mdb="$ol_arg" -@@ -4205,7 +4203,7 @@ if test "${enable_meta+set}" = set; then : +@@ -4205,7 +4162,7 @@ if test "${enable_meta+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33482,7 +31633,7 @@ index a9c2177..db327e8 100755 fi ol_enable_meta="$ol_arg" -@@ -4226,7 +4224,7 @@ if test "${enable_monitor+set}" = set; then : +@@ -4226,7 +4183,7 @@ if test "${enable_monitor+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33491,7 +31642,7 @@ index a9c2177..db327e8 100755 fi ol_enable_monitor="$ol_arg" -@@ -4247,7 +4245,7 @@ if test "${enable_ndb+set}" = set; then : +@@ -4247,7 +4204,7 @@ if test "${enable_ndb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33500,7 +31651,7 @@ index a9c2177..db327e8 100755 fi ol_enable_ndb="$ol_arg" -@@ -4268,7 +4266,7 @@ if test "${enable_null+set}" = set; then : +@@ -4268,7 +4225,7 @@ if test "${enable_null+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33509,7 +31660,7 @@ index a9c2177..db327e8 100755 fi ol_enable_null="$ol_arg" -@@ -4289,7 +4287,7 @@ if test "${enable_passwd+set}" = set; then : +@@ -4289,7 +4246,7 @@ if test "${enable_passwd+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33518,7 +31669,7 @@ index a9c2177..db327e8 100755 fi ol_enable_passwd="$ol_arg" -@@ -4310,7 +4308,7 @@ if test "${enable_perl+set}" = set; then : +@@ -4310,7 +4267,7 @@ if test "${enable_perl+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33527,7 +31678,7 @@ index a9c2177..db327e8 100755 fi ol_enable_perl="$ol_arg" -@@ -4331,7 +4329,7 @@ if test "${enable_relay+set}" = set; then : +@@ -4331,7 +4288,7 @@ if test "${enable_relay+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33536,7 +31687,7 @@ index a9c2177..db327e8 100755 fi ol_enable_relay="$ol_arg" -@@ -4352,7 +4350,7 @@ if test "${enable_shell+set}" = set; then : +@@ -4352,7 +4309,7 @@ if test "${enable_shell+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33545,7 +31696,7 @@ index a9c2177..db327e8 100755 fi ol_enable_shell="$ol_arg" -@@ -4373,7 +4371,7 @@ if test "${enable_sock+set}" = set; then : +@@ -4373,7 +4330,7 @@ if test "${enable_sock+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33554,7 +31705,7 @@ index a9c2177..db327e8 100755 fi ol_enable_sock="$ol_arg" -@@ -4394,7 +4392,7 @@ if test "${enable_sql+set}" = set; then : +@@ -4394,7 +4351,7 @@ if test "${enable_sql+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33563,7 +31714,7 @@ index a9c2177..db327e8 100755 fi ol_enable_sql="$ol_arg" -@@ -4443,7 +4441,7 @@ if test "${enable_overlays+set}" = set; then : +@@ -4443,7 +4400,7 @@ if test "${enable_overlays+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33572,7 +31723,7 @@ index a9c2177..db327e8 100755 fi ol_enable_overlays="$ol_arg" -@@ -4462,7 +4460,7 @@ if test "${enable_accesslog+set}" = set; then : +@@ -4462,7 +4419,7 @@ if test "${enable_accesslog+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33581,7 +31732,7 @@ index a9c2177..db327e8 100755 fi ol_enable_accesslog="$ol_arg" -@@ -4484,7 +4482,7 @@ if test "${enable_auditlog+set}" = set; then : +@@ -4484,7 +4441,7 @@ if test "${enable_auditlog+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33590,7 +31741,7 @@ index a9c2177..db327e8 100755 fi ol_enable_auditlog="$ol_arg" -@@ -4506,7 +4504,7 @@ if test "${enable_collect+set}" = set; then : +@@ -4506,7 +4463,7 @@ if test "${enable_collect+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33599,7 +31750,7 @@ index a9c2177..db327e8 100755 fi ol_enable_collect="$ol_arg" -@@ -4528,7 +4526,7 @@ if test "${enable_constraint+set}" = set; then : +@@ -4528,7 +4485,7 @@ if test "${enable_constraint+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33608,7 +31759,7 @@ index a9c2177..db327e8 100755 fi ol_enable_constraint="$ol_arg" -@@ -4550,7 +4548,7 @@ if test "${enable_dds+set}" = set; then : +@@ -4550,7 +4507,7 @@ if test "${enable_dds+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33617,7 +31768,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dds="$ol_arg" -@@ -4572,7 +4570,7 @@ if test "${enable_deref+set}" = set; then : +@@ -4572,7 +4529,7 @@ if test "${enable_deref+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33626,7 +31777,7 @@ index a9c2177..db327e8 100755 fi ol_enable_deref="$ol_arg" -@@ -4594,7 +4592,7 @@ if test "${enable_dyngroup+set}" = set; then : +@@ -4594,7 +4551,7 @@ if test "${enable_dyngroup+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33635,7 +31786,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dyngroup="$ol_arg" -@@ -4616,7 +4614,7 @@ if test "${enable_dynlist+set}" = set; then : +@@ -4616,7 +4573,7 @@ if test "${enable_dynlist+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33644,7 +31795,7 @@ index a9c2177..db327e8 100755 fi ol_enable_dynlist="$ol_arg" -@@ -4638,7 +4636,7 @@ if test "${enable_memberof+set}" = set; then : +@@ -4638,7 +4595,7 @@ if test "${enable_memberof+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33653,7 +31804,7 @@ index a9c2177..db327e8 100755 fi ol_enable_memberof="$ol_arg" -@@ -4660,7 +4658,7 @@ if test "${enable_ppolicy+set}" = set; then : +@@ -4660,7 +4617,7 @@ if test "${enable_ppolicy+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33662,7 +31813,7 @@ index a9c2177..db327e8 100755 fi ol_enable_ppolicy="$ol_arg" -@@ -4682,7 +4680,7 @@ if test "${enable_proxycache+set}" = set; then : +@@ -4682,7 +4639,7 @@ if test "${enable_proxycache+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33671,7 +31822,7 @@ index a9c2177..db327e8 100755 fi ol_enable_proxycache="$ol_arg" -@@ -4704,7 +4702,7 @@ if test "${enable_refint+set}" = set; then : +@@ -4704,7 +4661,7 @@ if test "${enable_refint+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33680,7 +31831,7 @@ index a9c2177..db327e8 100755 fi ol_enable_refint="$ol_arg" -@@ -4726,7 +4724,7 @@ if test "${enable_retcode+set}" = set; then : +@@ -4726,7 +4683,7 @@ if test "${enable_retcode+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33689,7 +31840,7 @@ index a9c2177..db327e8 100755 fi ol_enable_retcode="$ol_arg" -@@ -4748,7 +4746,7 @@ if test "${enable_rwm+set}" = set; then : +@@ -4748,7 +4705,7 @@ if test "${enable_rwm+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33698,7 +31849,7 @@ index a9c2177..db327e8 100755 fi ol_enable_rwm="$ol_arg" -@@ -4770,7 +4768,7 @@ if test "${enable_seqmod+set}" = set; then : +@@ -4770,7 +4727,7 @@ if test "${enable_seqmod+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33707,7 +31858,7 @@ index a9c2177..db327e8 100755 fi ol_enable_seqmod="$ol_arg" -@@ -4792,7 +4790,7 @@ if test "${enable_sssvlv+set}" = set; then : +@@ -4792,7 +4749,7 @@ if test "${enable_sssvlv+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33716,7 +31867,7 @@ index a9c2177..db327e8 100755 fi ol_enable_sssvlv="$ol_arg" -@@ -4814,7 +4812,7 @@ if test "${enable_syncprov+set}" = set; then : +@@ -4814,7 +4771,7 @@ if test "${enable_syncprov+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33725,7 +31876,7 @@ index a9c2177..db327e8 100755 fi ol_enable_syncprov="$ol_arg" -@@ -4836,7 +4834,7 @@ if test "${enable_translucent+set}" = set; then : +@@ -4836,7 +4793,7 @@ if test "${enable_translucent+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33734,7 +31885,7 @@ index a9c2177..db327e8 100755 fi ol_enable_translucent="$ol_arg" -@@ -4858,7 +4856,7 @@ if test "${enable_unique+set}" = set; then : +@@ -4858,7 +4815,7 @@ if test "${enable_unique+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33743,7 +31894,7 @@ index a9c2177..db327e8 100755 fi ol_enable_unique="$ol_arg" -@@ -4880,7 +4878,7 @@ if test "${enable_valsort+set}" = set; then : +@@ -4880,7 +4837,7 @@ if test "${enable_valsort+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then @@ -33752,7 +31903,7 @@ index a9c2177..db327e8 100755 fi ol_enable_valsort="$ol_arg" -@@ -4920,6 +4918,13 @@ else +@@ -4920,6 +4877,13 @@ else fi @@ -33766,7 +31917,7 @@ index a9c2177..db327e8 100755 # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} -@@ -4946,6 +4951,13 @@ fi +@@ -4946,6 +4910,13 @@ fi @@ -33780,7 +31931,7 @@ index a9c2177..db327e8 100755 # validate options if test $ol_enable_slapd = no ; then if test $ol_enable_slapi = yes ; then -@@ -5032,7 +5044,7 @@ elif test $ol_enable_modules != yes && +@@ -5032,7 +5003,7 @@ elif test $ol_enable_modules != yes && test $ol_enable_sql = no ; then if test $ol_enable_slapd = yes ; then @@ -33789,7 +31940,7 @@ index a9c2177..db327e8 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 +5053,18 @@ $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;} fi if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then @@ -33811,7 +31962,7 @@ index a9c2177..db327e8 100755 fi ol_with_cyrus_sasl=yes fi -@@ -5169,7 +5181,7 @@ do +@@ -5169,7 +5140,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; } @@ -33820,16 +31971,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -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 +@@ -5208,7 +5179,7 @@ done if test "$CC" = cc ; then if test $ol_with_threads != auto ; then @@ -33838,7 +31980,7 @@ index a9c2177..db327e8 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 +5243,7 @@ do +@@ -5231,7 +5202,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; } @@ -33847,16 +31989,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -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" +@@ -5270,7 +5241,7 @@ test -n "$CC" || CC="missing" if test "${CC}" = "missing" ; then @@ -33865,7 +31998,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -5281,7 +5293,7 @@ do +@@ -5281,7 +5252,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; } @@ -33874,16 +32007,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -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" +@@ -5320,118 +5291,24 @@ test -n "$AR" || AR="missing" if test "${AR}" = "missing" ; then @@ -34012,18 +32136,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -5439,8 +5357,8 @@ do - IFS=$as_save_IFS +@@ -5440,7 +5317,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +5368,10 @@ IFS=$as_save_IFS +@@ -5450,10 +5327,10 @@ IFS=$as_save_IFS fi fi @@ -34038,7 +32160,7 @@ index a9c2177..db327e8 100755 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -5461,17 +5379,17 @@ fi +@@ -5461,17 +5338,17 @@ fi fi @@ -34063,18 +32185,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -5479,8 +5397,8 @@ do - IFS=$as_save_IFS +@@ -5480,7 +5357,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +5408,17 @@ IFS=$as_save_IFS +@@ -5490,17 +5367,17 @@ IFS=$as_save_IFS fi fi @@ -34098,7 +32218,7 @@ index a9c2177..db327e8 100755 else case $cross_compiling:$ac_tool_warned in yes:) -@@ -5508,23 +5426,22 @@ yes:) +@@ -5508,23 +5385,22 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -34130,18 +32250,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -5532,8 +5449,8 @@ do - IFS=$as_save_IFS +@@ -5533,7 +5409,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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,42 +5460,37 @@ IFS=$as_save_IFS +@@ -5543,30 +5419,29 @@ IFS=$as_save_IFS fi fi @@ -34183,21 +32301,20 @@ index a9c2177..db327e8 100755 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do - IFS=$as_save_IFS +@@ -5574,11 +5449,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +5498,42 @@ done +@@ -5586,44 +5457,42 @@ done done IFS=$as_save_IFS @@ -34212,9 +32329,9 @@ index a9c2177..db327e8 100755 - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi + 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 @@ -34265,18 +32382,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -5631,8 +5541,8 @@ do - IFS=$as_save_IFS +@@ -5632,7 +5501,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +5552,28 @@ IFS=$as_save_IFS +@@ -5642,32 +5511,28 @@ IFS=$as_save_IFS fi fi @@ -34320,18 +32435,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -5675,8 +5581,8 @@ do - IFS=$as_save_IFS +@@ -5676,7 +5541,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +5592,17 @@ IFS=$as_save_IFS +@@ -5686,21 +5551,17 @@ IFS=$as_save_IFS fi fi @@ -34359,7 +32472,7 @@ index a9c2177..db327e8 100755 else case $cross_compiling:$ac_tool_warned in yes:) -@@ -5708,800 +5610,1409 @@ yes:) +@@ -5708,1077 +5569,2262 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -34516,7 +32629,21 @@ index a9c2177..db327e8 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_link") 2>&5 @@ -34541,7 +32668,65 @@ index a9c2177..db327e8 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; } --fi ++ ++ ++ ++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 -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; } @@ -34554,13 +32739,17 @@ index a9c2177..db327e8 100755 -#include -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 @@ -34583,7 +32772,15 @@ index a9c2177..db327e8 100755 - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; --esac ++ ++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 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 @@ -34629,16 +32826,7 @@ index a9c2177..db327e8 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_compile") 2>&5 @@ -34694,62 +32882,8 @@ index a9c2177..db327e8 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' -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+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 -{ $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 @@ -34773,15 +32907,11 @@ index a9c2177..db327e8 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 @@ -34793,14 +32923,6 @@ index a9c2177..db327e8 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; @@ -34824,16 +32946,8 @@ index a9c2177..db327e8 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" @@ -34853,7 +32967,7 @@ index a9c2177..db327e8 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 @@ -34873,23 +32987,7 @@ index a9c2177..db327e8 100755 + esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ -+{ $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 +-fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi @@ -34914,10 +33012,7 @@ index a9c2177..db327e8 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 -+ if test "x$enable_dependency_tracking" != xno; then -+ AMDEP_TRUE= -+ AMDEP_FALSE='#' - else +-else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34944,7 +33039,7 @@ index a9c2177..db327e8 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 @@ -34953,12 +33048,15 @@ index a9c2177..db327e8 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);}; @@ -34979,15 +33077,20 @@ index a9c2177..db327e8 100755 - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg --fi ++# 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 - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -- -+ AMDEP_TRUE='#' -+ AMDEP_FALSE= + ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++ am__nodep='_no' fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in @@ -35003,9 +33106,16 @@ index a9c2177..db327e8 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' @@ -35056,7 +33166,7 @@ index a9c2177..db327e8 100755 + 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 -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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -35192,11 +33302,7 @@ index a9c2177..db327e8 100755 - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break -+ 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 +- fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in @@ -35212,35 +33318,29 @@ index a9c2177..db327e8 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 -- 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 ++else + { $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 @@ -35255,7 +33355,10 @@ index a9c2177..db327e8 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. @@ -35263,8 +33366,13 @@ index a9c2177..db327e8 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 + $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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else @@ -35301,58 +33409,15 @@ index a9c2177..db327e8 100755 - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break -+ 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 +- done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac -+IFS=$as_save_IFS - +- - $ac_path_GREP_found && break 3 - done - 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 -+ { $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" ++ 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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi @@ -35361,22 +33426,11 @@ index a9c2177..db327e8 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 -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi +- fi -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; } @@ -35395,13 +33449,11 @@ index a9c2177..db327e8 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 -+ 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 ++ # 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 : @@ -35418,6 +33470,7 @@ index a9c2177..db327e8 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 @@ -35451,34 +33504,223 @@ index a9c2177..db327e8 100755 - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- 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" + $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_EGREP_found && break 3 -- done -+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 ++ ++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 +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 + else +- with_gnu_ld=no + { $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 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 +-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 &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 &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 ++ 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 : +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe @@ -35488,51 +33730,117 @@ index a9c2177..db327e8 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 + $as_echo_n "(cached) " >&6 + else +- if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else + 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 +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 -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" + $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 -- fi --else -- ac_cv_path_EGREP=$EGREP --fi - -- fi +- IFS="$lt_save_ifs" +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++IFS=$as_save_IFS ++ 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" -+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; } +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 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +-$as_echo "no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -+fi -+ -+ + 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 +- ;; + 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 @@ -35545,15 +33853,42 @@ index a9c2177..db327e8 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 @@ -35573,15 +33908,36 @@ index a9c2177..db327e8 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 () +{ @@ -35955,7 +34311,8 @@ index a9c2177..db327e8 100755 +/* end confdefs.h. */ +#include +#include -+struct stat; ++#include ++#include +/* 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); @@ -36051,8 +34408,8 @@ index a9c2177..db327e8 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 @@ -36087,16 +34444,16 @@ index a9c2177..db327e8 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 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch 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 @@ -36105,8 +34462,8 @@ index a9c2177..db327e8 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 @@ -36114,7 +34471,7 @@ index a9c2177..db327e8 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} @@ -36190,7 +34547,7 @@ index a9c2177..db327e8 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" -+ as_fn_executable_p "$ac_path_SED" || continue ++ { test -f "$ac_path_SED" && $as_test_x "$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 @@ -36266,7 +34623,7 @@ index a9c2177..db327e8 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" -+ as_fn_executable_p "$ac_path_GREP" || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$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 @@ -36332,7 +34689,7 @@ index a9c2177..db327e8 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" -+ as_fn_executable_p "$ac_path_EGREP" || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$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 @@ -36399,7 +34756,7 @@ index a9c2177..db327e8 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" -+ as_fn_executable_p "$ac_path_FGREP" || continue ++ { test -f "$ac_path_FGREP" && $as_test_x "$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 @@ -36464,14 +34821,13 @@ index a9c2177..db327e8 100755 + + + - - - -@@ -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 ++ ++ ++ ++# 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 + with_gnu_ld=no +fi + @@ -36656,7 +35012,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -36700,7 +35056,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -37124,7 +35480,7 @@ index a9c2177..db327e8 100755 + 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 -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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37164,7 +35520,7 @@ index a9c2177..db327e8 100755 + 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 -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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37317,14 +35673,14 @@ index a9c2177..db327e8 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 -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac + + 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 + lt_cv_deplibs_check_method=pass_all + ;; + @@ -37467,7 +35823,7 @@ index a9c2177..db327e8 100755 + 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 -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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37507,7 +35863,7 @@ index a9c2177..db327e8 100755 + 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 -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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37608,7 +35964,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -37652,7 +36008,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37777,7 +36133,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -37817,7 +36173,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -37826,7 +36182,7 @@ index a9c2177..db327e8 100755 + done +IFS=$as_save_IFS + - fi ++fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then @@ -37876,7 +36232,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -37916,7 +36272,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -37962,53 +36318,18 @@ index a9c2177..db327e8 100755 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= - --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 -n "$RANLIB"; then + 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 --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; } ++ ;; ++ esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" - fi --if test "${lt_cv_path_LD+set}" = set; then : ++fi + +case $host_os in + darwin*) @@ -38069,26 +36390,8 @@ index a9c2177..db327e8 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 -- 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 &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?!! ;)] @@ -38129,12 +36432,15 @@ index a9c2177..db327e8 100755 + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' -+ ;; + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac -+ + +-# 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'*) @@ -38155,9 +36461,12 @@ index a9c2177..db327e8 100755 +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 + @@ -38182,14 +36491,24 @@ index a9c2177..db327e8 100755 +" 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 @@ -38203,7 +36522,10 @@ index a9c2177..db327e8 100755 +#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=$? @@ -38297,16 +36619,13 @@ index a9c2177..db327e8 100755 + 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 ++ fi + 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. @@ -38317,260 +36636,33 @@ index a9c2177..db327e8 100755 + 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; } ++fi ++ +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 ++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 -- # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 &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' ++fi ++ +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: 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 -- ;; - --netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' -- fi -- ;; - --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; - --nto-qnx*) -- lt_cv_deplibs_check_method=unknown -- ;; - --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -- fi -- ;; ++fi ++ ++ ++ ++ ++ ++ ++ ++ -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all @@ -38613,6 +36705,16 @@ index a9c2177..db327e8 100755 - ;; -esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + @@ -38663,77 +36765,34 @@ index a9c2177..db327e8 100755 # Check whether --enable-libtool-lock was given. -@@ -6897,55 +8908,155 @@ ia64-*-hpux*) - ac_status=$? +@@ -6898,94 +8869,101 @@ 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 + case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; -- esac -+ case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi + esac fi rm -rf conftest* ;; --*-*-irix6*) -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + *-*-irix6*) # Find out which ABI we are using. - echo '#line 6913 "configure"' > conftest.$ac_ext -+ 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 +- 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*) @@ -38757,6 +36816,90 @@ index a9c2177..db327e8 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*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *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" +- ;; ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; + esac +- ;; ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in @@ -38797,102 +36940,46 @@ index a9c2177..db327e8 100755 + esac + ;; esac -- fi fi rm -rf conftest* - ;; - --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; } +@@ -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 : +if ${lt_cv_cc_needs_belf+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ lt_cv_cc_needs_belf=yes -+else -+ lt_cv_cc_needs_belf=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -+$as_echo "$lt_cv_cc_needs_belf" >&6; } -+ if test 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 + $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 + ;; +*-*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 -@@ -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*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) - 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 elf_x86_64" ++ ;; + 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 @@ -38904,12 +36991,10 @@ index a9c2177..db327e8 100755 + LD="${LD-ld} -64" + fi + ;; - esac - ;; - esac - fi -- rm -rf conftest* -- ;; ++ esac ++ ;; ++ esac ++ fi + rm -rf conftest* + ;; +esac @@ -38933,7 +37018,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -38973,7 +37058,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -39053,7 +37138,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -39093,7 +37178,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -39145,7 +37230,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -39153,37 +37238,19 @@ index a9c2177..db327e8 100755 +done + done +IFS=$as_save_IFS - --*-*-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 : -- $as_echo_n "(cached) " >&6 ++ +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } - else -- 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 ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - --int --main () --{ ++ ++ +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT @@ -39203,7 +37270,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -39211,38 +37278,18 @@ index a9c2177..db327e8 100755 +done + done +IFS=$as_save_IFS - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- lt_cv_cc_needs_belf=yes ++ +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } - else -- lt_cv_cc_needs_belf=no ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - 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 ++ + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else @@ -39253,12 +37300,7 @@ index a9c2177..db327e8 100755 +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT - 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 ++ fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi @@ -39279,18 +37321,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7056,8 +9417,8 @@ do - IFS=$as_save_IFS +@@ -7057,7 +9378,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9428,10 @@ IFS=$as_save_IFS +@@ -7067,10 +9388,10 @@ IFS=$as_save_IFS fi fi @@ -39305,7 +37345,7 @@ index a9c2177..db327e8 100755 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -7078,17 +9439,17 @@ fi +@@ -7078,17 +9399,17 @@ fi fi @@ -39330,18 +37370,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7096,8 +9457,8 @@ do - IFS=$as_save_IFS +@@ -7097,7 +9418,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9468,17 @@ IFS=$as_save_IFS +@@ -7107,17 +9428,17 @@ IFS=$as_save_IFS fi fi @@ -39365,7 +37403,7 @@ index a9c2177..db327e8 100755 else case $cross_compiling:$ac_tool_warned in yes:) -@@ -7125,22 +9486,22 @@ yes:) +@@ -7125,22 +9446,22 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -39396,18 +37434,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7148,8 +9509,8 @@ do - IFS=$as_save_IFS +@@ -7149,7 +9470,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9520,10 @@ IFS=$as_save_IFS +@@ -7159,10 +9480,10 @@ IFS=$as_save_IFS fi fi @@ -39422,7 +37458,7 @@ index a9c2177..db327e8 100755 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -7170,17 +9531,17 @@ fi +@@ -7170,17 +9491,17 @@ fi fi @@ -39447,18 +37483,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7188,8 +9549,8 @@ do - IFS=$as_save_IFS +@@ -7189,7 +9510,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9560,17 @@ IFS=$as_save_IFS +@@ -7199,17 +9520,17 @@ IFS=$as_save_IFS fi fi @@ -39482,7 +37516,7 @@ index a9c2177..db327e8 100755 else case $cross_compiling:$ac_tool_warned in yes:) -@@ -7217,22 +9578,22 @@ yes:) +@@ -7217,22 +9538,22 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -39513,18 +37547,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7240,8 +9601,8 @@ do - IFS=$as_save_IFS +@@ -7241,7 +9562,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9612,10 @@ IFS=$as_save_IFS +@@ -7251,10 +9572,10 @@ IFS=$as_save_IFS fi fi @@ -39539,7 +37571,7 @@ index a9c2177..db327e8 100755 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -7262,17 +9623,17 @@ fi +@@ -7262,17 +9583,17 @@ fi fi @@ -39564,18 +37596,16 @@ index a9c2177..db327e8 100755 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -7280,8 +9641,8 @@ do - IFS=$as_save_IFS +@@ -7281,7 +9602,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 +9652,17 @@ IFS=$as_save_IFS +@@ -7291,17 +9612,17 @@ IFS=$as_save_IFS fi fi @@ -39599,7 +37629,7 @@ index a9c2177..db327e8 100755 else case $cross_compiling:$ac_tool_warned in yes:) -@@ -7309,19 +9670,176 @@ yes:) +@@ -7309,19 +9630,176 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -39781,7 +37811,7 @@ index a9c2177..db327e8 100755 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7334,7 +9852,7 @@ if test -n "$CPP" && test -d "$CPP"; then +@@ -7334,7 +9812,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then @@ -39790,7 +37820,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -7364,7 +9882,7 @@ else +@@ -7364,7 +9842,7 @@ else # Broken: fails on valid input. continue fi @@ -39799,7 +37829,7 @@ index a9c2177..db327e8 100755 # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. -@@ -7380,11 +9898,11 @@ else +@@ -7380,11 +9858,11 @@ else ac_preproc_ok=: break fi @@ -39813,7 +37843,7 @@ index a9c2177..db327e8 100755 if $ac_preproc_ok; then : break fi -@@ -7423,7 +9941,7 @@ else +@@ -7423,7 +9901,7 @@ else # Broken: fails on valid input. continue fi @@ -39822,7 +37852,7 @@ index a9c2177..db327e8 100755 # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. -@@ -7439,18 +9957,18 @@ else +@@ -7439,18 +9917,18 @@ else ac_preproc_ok=: break fi @@ -39845,7 +37875,7 @@ index a9c2177..db327e8 100755 fi ac_ext=c -@@ -7462,7 +9980,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -7462,7 +9940,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; } @@ -39854,7 +37884,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -7579,8 +10097,7 @@ do : +@@ -7579,8 +10057,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 " @@ -39864,7 +37894,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -7592,8 +10109,9 @@ done +@@ -7592,8 +10069,9 @@ done for ac_header in dlfcn.h do : @@ -39876,12 +37906,12 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF -@@ -7603,693 +10121,198 @@ fi +@@ -7603,692 +10081,197 @@ fi done -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- + -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } @@ -39890,7 +37920,7 @@ index a9c2177..db327e8 100755 -else - i=0 - teststring="ABCD" -- + - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc @@ -39899,13 +37929,14 @@ index a9c2177..db327e8 100755 - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; -- + - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; ++# Set options - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes @@ -39971,26 +38002,9 @@ index a9c2177..db327e8 100755 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - ;; - esac -+# Set options --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; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 --$as_echo "none" >&6; } --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 ++ ++ + + +# Check whether --with-pic was given. @@ -40011,16 +38025,62 @@ index a9c2177..db327e8 100755 + IFS="$lt_save_ifs" + ;; + esac - else ++else + pic_mode=default -+fi + 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 whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then : ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +-$as_echo "none" >&6; } ++ enable_fast_install=yes + 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?!! ;)] -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' -+test -z "$pic_mode" && pic_mode=default -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' @@ -40080,31 +38140,13 @@ index a9c2177..db327e8 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 -+ # Check whether --enable-fast-install was given. -+if test "${enable_fast_install+set}" = set; then : -+ enableval=$enable_fast_install; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac -+else -+ enable_fast_install=yes -+fi ++# 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" @@ -40221,11 +38263,6 @@ index a9c2177..db327e8 100755 - lt_cv_sys_global_symbol_pipe= - fi -done -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -fi @@ -40369,6 +38406,9 @@ index a9c2177..db327e8 100755 -done - done -IFS=$as_save_IFS ++test -z "$LN_S" && LN_S="ln -s" ++ ++ -fi -fi @@ -40525,9 +38565,10 @@ index a9c2177..db327e8 100755 -$as_echo "no" >&6; } -fi -+test -z "$LN_S" && LN_S="ln -s" --fi ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST + 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. @@ -40535,11 +38576,19 @@ index a9c2177..db327e8 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_n "(cached) " >&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 - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. --else ++ rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs + else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do @@ -40554,9 +38603,11 @@ index a9c2177..db327e8 100755 -done - done -IFS=$as_save_IFS - --fi +- -fi ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs + 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 @@ -40564,21 +38615,11 @@ index a9c2177..db327e8 100755 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST ++rmdir .libs 2>/dev/null fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } ++objdir=$lt_cv_objdir - if test "x$ac_ct_STRIP" = x; then - STRIP=":" @@ -40590,29 +38631,8 @@ index a9c2177..db327e8 100755 -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP -- fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -+$as_echo_n "checking for objdir... " >&6; } -+if ${lt_cv_objdir+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- STRIP="$ac_cv_prog_STRIP" -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -+$as_echo "$lt_cv_objdir" >&6; } -+objdir=$lt_cv_objdir + - - ++ + + +cat >>confdefs.h <<_ACEOF @@ -40630,32 +38650,31 @@ index a9c2177..db327e8 100755 + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES -+ fi + fi +-else +- STRIP="$ac_cv_prog_STRIP" +-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 -+ -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ - old_CC="$CC" - old_CFLAGS="$CFLAGS" - # Set sane defaults for various variables +-# 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 "$LTCFLAGS" && LTCFLAGS=$CFLAGS - test -z "$LD" && LD=ld +-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 @@ -40663,13 +38682,16 @@ index a9c2177..db327e8 100755 -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: - test -z "$ac_objext" && ac_objext=o +-test -z "$ac_objext" && ac_objext=o ++with_gnu_ld="$lt_cv_prog_gnu_ld" -# 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*) @@ -40681,11 +38703,16 @@ index a9c2177..db327e8 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 - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -@@ -8298,16 +10321,17 @@ for cc_temp in $compiler""; do +@@ -8298,16 +10281,17 @@ for cc_temp in $compiler""; do *) break;; esac done @@ -40705,7 +38732,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8332,7 +10356,7 @@ else +@@ -8332,7 +10316,7 @@ else $EGREP "$file_magic_regex" > /dev/null; then : else @@ -40714,7 +38741,7 @@ index a9c2177..db327e8 100755 *** Warning: the command libtool uses to detect shared libraries, *** $file_magic_cmd, produces output that libtool cannot recognize. -@@ -8343,7 +10367,7 @@ else +@@ -8343,7 +10327,7 @@ else *** may want to report the problem to your system manager and/or to *** bug-libtool@gnu.org @@ -40723,7 +38750,7 @@ index a9c2177..db327e8 100755 fi ;; esac fi -@@ -8365,11 +10389,15 @@ else +@@ -8365,11 +10349,15 @@ else $as_echo "no" >&6; } fi @@ -40740,7 +38767,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8394,7 +10422,7 @@ else +@@ -8394,7 +10382,7 @@ else $EGREP "$file_magic_regex" > /dev/null; then : else @@ -40749,7 +38776,7 @@ index a9c2177..db327e8 100755 *** Warning: the command libtool uses to detect shared libraries, *** $file_magic_cmd, produces output that libtool cannot recognize. -@@ -8405,7 +10433,7 @@ else +@@ -8405,7 +10393,7 @@ else *** may want to report the problem to your system manager and/or to *** bug-libtool@gnu.org @@ -40758,7 +38785,7 @@ index a9c2177..db327e8 100755 fi ;; esac fi -@@ -8427,6 +10455,7 @@ else +@@ -8427,6 +10415,7 @@ else $as_echo "no" >&6; } fi @@ -40766,7 +38793,7 @@ index a9c2177..db327e8 100755 else MAGIC_CMD=: fi -@@ -8436,28 +10465,8 @@ fi +@@ -8436,28 +10425,8 @@ fi ;; esac @@ -40796,7 +38823,7 @@ index a9c2177..db327e8 100755 lt_save_CC="$CC" ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -8474,113 +10483,64 @@ objext=o +@@ -8474,113 +10443,64 @@ objext=o objext=$objext # Code to be used in simple compile tests @@ -40940,7 +38967,7 @@ index a9c2177..db327e8 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 +10551,21 @@ else +@@ -8591,21 +10511,21 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -40968,7 +38995,7 @@ index a9c2177..db327e8 100755 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -@@ -8619,12 +10579,15 @@ fi +@@ -8619,12 +10539,15 @@ fi fi @@ -40987,7 +39014,7 @@ index a9c2177..db327e8 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8640,19 +10603,29 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8640,19 +10563,29 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; amigaos*) @@ -41023,7 +39050,7 @@ index a9c2177..db327e8 100755 lt_prog_compiler_pic='-DDLL_EXPORT' ;; -@@ -8662,6 +10635,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8662,6 +10595,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fno-common' ;; @@ -41055,7 +39082,7 @@ index a9c2177..db327e8 100755 msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -8669,29 +10667,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8669,29 +10627,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } enable_shared=no ;; @@ -41100,7 +39127,7 @@ index a9c2177..db327e8 100755 else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in -@@ -8704,18 +10704,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8704,18 +10664,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -41120,7 +39147,7 @@ index a9c2177..db327e8 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 +10733,34 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8743,19 +10693,34 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-non_shared' ;; @@ -41163,7 +39190,7 @@ index a9c2177..db327e8 100755 # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' -@@ -8767,25 +10772,72 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8767,25 +10732,72 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; @@ -41240,7 +39267,7 @@ index a9c2177..db327e8 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8798,7 +10850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8798,7 +10810,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-Bstatic' ;; @@ -41249,7 +39276,7 @@ index a9c2177..db327e8 100755 lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' -@@ -8811,6 +10863,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8811,6 +10823,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } fi ;; @@ -41262,7 +39289,7 @@ index a9c2177..db327e8 100755 unicos*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_can_build_shared=no -@@ -8827,22 +10885,39 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8827,84 +10845,204 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } esac fi @@ -41288,81 +39315,61 @@ index a9c2177..db327e8 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 -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ ++# ++# 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_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} 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 ++ $as_echo_n "(cached) " >&6 ++else + 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. -@@ -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) ++ 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:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8860: \$? = $ac_status" >&5 ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # 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 ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes - fi - fi -- $rm conftest* ++ fi ++ fi + $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_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" ;; -@@ -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 ++ 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 ++ + + + @@ -41416,15 +39423,26 @@ index a9c2177..db327e8 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 + $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" + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest @@ -41433,29 +39451,41 @@ index a9c2177..db327e8 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. -+ 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:'` + # 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) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? + ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:8860: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s "$ac_outfile"; then + 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 + # 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 + # 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 + fi + fi +- $rm conftest* + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for @@ -41465,15 +39495,37 @@ index a9c2177..db327e8 100755 + cd .. + $RM -r 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_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; } @@ -41492,7 +39544,7 @@ index a9c2177..db327e8 100755 lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or -@@ -8915,43 +11093,45 @@ else +@@ -8915,43 +11053,45 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -41549,7 +39601,7 @@ index a9c2177..db327e8 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 +11147,38 @@ else +@@ -8967,31 +11107,38 @@ else need_locks=no fi @@ -41599,7 +39651,7 @@ index a9c2177..db327e8 100755 # include_expsyms should be a list of space-separated symbols to be *always* # included in the symbol list include_expsyms= -@@ -8999,26 +11186,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -8999,26 +11146,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'. @@ -41629,7 +39681,7 @@ index a9c2177..db327e8 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 +11204,43 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +@@ -9026,13 +11164,43 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` with_gnu_ld=no fi ;; @@ -41673,7 +39725,7 @@ index a9c2177..db327e8 100755 # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' -@@ -9040,16 +11248,17 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +@@ -9040,16 +11208,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 @@ -41697,7 +39749,7 @@ index a9c2177..db327e8 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 +11268,40 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +@@ -9059,38 +11228,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 @@ -41756,7 +39808,7 @@ index a9c2177..db327e8 100755 allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME -@@ -9100,17 +11311,19 @@ EOF +@@ -9100,17 +11271,19 @@ EOF fi ;; @@ -41781,7 +39833,7 @@ index a9c2177..db327e8 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 +11332,120 @@ EOF +@@ -9119,57 +11292,120 @@ EOF echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ @@ -41925,7 +39977,7 @@ index a9c2177..db327e8 100755 *** Warning: The releases 2.8.* of the GNU linker cannot reliably *** create shared libraries on Solaris systems. Therefore, libtool -@@ -9178,15 +11454,46 @@ EOF +@@ -9178,15 +11414,46 @@ EOF *** your PATH or compiler configuration so that the native linker is *** used, and then restart. @@ -41976,7 +40028,7 @@ index a9c2177..db327e8 100755 sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= -@@ -9195,9 +11502,9 @@ EOF +@@ -9195,9 +11462,9 @@ EOF ;; *) @@ -41989,7 +40041,7 @@ index a9c2177..db327e8 100755 else ld_shlibs=no fi -@@ -9220,14 +11527,14 @@ EOF +@@ -9220,14 +11487,14 @@ EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes @@ -42006,7 +40058,7 @@ index a9c2177..db327e8 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 +11544,26 @@ EOF +@@ -9237,23 +11504,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 @@ -42041,7 +40093,7 @@ index a9c2177..db327e8 100755 esac exp_sym_flag='-bexport' -@@ -9268,29 +11578,32 @@ EOF +@@ -9268,29 +11538,32 @@ EOF archive_cmds='' hardcode_direct=yes @@ -42086,7 +40138,7 @@ index a9c2177..db327e8 100755 esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then -@@ -9299,18 +11612,19 @@ EOF +@@ -9299,18 +11572,19 @@ EOF else # not using gcc if test "$host_cpu" = ia64; then @@ -42110,7 +40162,7 @@ index a9c2177..db327e8 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 +11632,15 @@ EOF +@@ -9318,8 +11592,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' @@ -42128,7 +40180,7 @@ index a9c2177..db327e8 100755 /* end confdefs.h. */ int -@@ -9332,26 +11653,47 @@ main () +@@ -9332,26 +11613,47 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -42188,7 +40240,7 @@ index a9c2177..db327e8 100755 /* end confdefs.h. */ int -@@ -9364,113 +11706,163 @@ main () +@@ -9364,113 +11666,163 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -42430,7 +40482,7 @@ index a9c2177..db327e8 100755 ;; dgux*) -@@ -9479,10 +11871,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9479,10 +11831,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; @@ -42441,7 +40493,7 @@ index a9c2177..db327e8 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 +11883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9495,7 +11843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. @@ -42450,7 +40502,7 @@ index a9c2177..db327e8 100755 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes -@@ -9503,8 +11891,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9503,8 +11851,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -42461,7 +40513,7 @@ index a9c2177..db327e8 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9512,9 +11900,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9512,9 +11860,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -42473,7 +40525,7 @@ index a9c2177..db327e8 100755 fi hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: -@@ -9526,48 +11914,101 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9526,48 +11874,101 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec='${wl}-E' ;; @@ -42597,7 +40649,7 @@ index a9c2177..db327e8 100755 export_dynamic_flag_spec='${wl}-E' # hardcode_minus_L: Not really in the search PATH, -@@ -9580,18 +12021,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9580,18 +11981,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -42651,7 +40703,7 @@ index a9c2177..db327e8 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 +12081,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9609,25 +12041,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; @@ -42702,7 +40754,7 @@ index a9c2177..db327e8 100755 fi ;; -@@ -9635,18 +12115,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9635,18 +12075,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 @@ -42726,7 +40778,7 @@ index a9c2177..db327e8 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; -@@ -9654,57 +12135,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9654,57 +12095,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}\*' @@ -42817,7 +40869,7 @@ index a9c2177..db327e8 100755 esac link_all_deplibs=yes ;; -@@ -9761,36 +12244,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9761,36 +12204,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; @@ -42884,7 +40936,7 @@ index a9c2177..db327e8 100755 ;; uts4*) -@@ -9803,16 +12295,35 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9803,16 +12255,35 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs=no ;; esac @@ -42924,7 +40976,7 @@ index a9c2177..db327e8 100755 # # Do we need to explicitly link libc? -@@ -9833,2220 +12344,1696 @@ x|xyes) +@@ -9833,2220 +12304,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; } @@ -43974,22 +42026,7 @@ index a9c2177..db327e8 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 ;; ++ + + + @@ -44114,7 +42151,7 @@ index a9c2177..db327e8 100755 + lt_count--; + } + } -+ } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } @@ -44144,7 +42181,21 @@ index a9c2177..db327e8 100755 +sys_lib_dlsearch_path_spec="/lib /usr/lib" +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 @@ -44211,7 +42262,8 @@ index a9c2177..db327e8 100755 -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 @@ -44227,13 +42279,6 @@ index a9c2177..db327e8 100755 - cat > conftest.$ac_ext < --#endif -+ ;; - --#include +amigaos*) + case $host_cpu in + powerpc) @@ -44249,6 +42294,30 @@ index a9c2177..db327e8 100755 + esac + ;; +-#if HAVE_DLFCN_H +-#include +-#endif ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; + +-#include ++bsdi[45]*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; + -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else @@ -44258,11 +42327,11 @@ index a9c2177..db327e8 100755 -# define LT_DLGLOBAL 0 -# endif -#endif -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; ++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. */ @@ -44285,34 +42354,6 @@ index a9c2177..db327e8 100755 -# endif -# endif -#endif -+bsdi[45]*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+cygwin* | mingw* | pw32* | cegcc*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; + case $GCC,$cc_basename in + yes,*) + # gcc @@ -44332,16 +42373,44 @@ index a9c2177..db327e8 100755 + $RM \$dlpath' + shlibpath_overrides_runpath=yes +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++ 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; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ 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); */ - } -+ 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}' ++ *,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); -} @@ -44357,36 +42426,6 @@ index a9c2177..db327e8 100755 - 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 ;; -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; -+ mingw* | cegcc*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; - esac -- else : -- # compilation failed -- lt_cv_dlopen_self_static=no -- fi --fi --rm -fr conftest* -+ dynamic_linker='Win32 ld.exe' -+ ;; - -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' - --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 --$as_echo "$lt_cv_dlopen_self_static" >&6; } -- fi + case $build_os in + mingw*) + sys_lib_search_path_spec= @@ -44422,11 +42461,14 @@ index a9c2177..db327e8 100755 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; -+ esac + esac +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no +- fi +-fi +-rm -fr conftest* -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" + # 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'\''`~ @@ -44438,38 +42480,30 @@ index a9c2177..db327e8 100755 + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' - ;; -- esac -- -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac ++ ;; -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; +-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 --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; } + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; --{ $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 +- 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 @@ -44481,6 +42515,88 @@ index a9c2177..db327e8 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 @@ -44490,32 +42606,90 @@ index a9c2177..db327e8 100755 - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++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 ;; -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; } -+dgux*) ++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' ++ 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 @@ -44527,17 +42701,7 @@ index a9c2177..db327e8 100755 - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -+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 +- 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. @@ -44601,45 +42765,49 @@ index a9c2177..db327e8 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\"\`\\\"" -+ 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 - ;; -- *) +- ;; ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; + *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes - ;; -- esac +- ;; ++ 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 - 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" @@ -44699,146 +42867,48 @@ index a9c2177..db327e8 100755 - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -+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 build shared libraries. -build_libtool_libs=$enable_shared -+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 build static libraries. -build_old_libs=$enable_static -+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 add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc -+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 -+ ;; - +- -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+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 -+ ;; - +- -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# 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 + ;; --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os +-# A language-specific compiler. +-CC=$lt_compiler +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor @@ -44850,10 +42920,8 @@ index a9c2177..db327e8 100755 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 @@ -44866,15 +42934,14 @@ index a9c2177..db327e8 100755 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ --# An echo program that does not interpret backslashes. --echo=$lt_echo +-# An ERE matcher. +-EGREP=$lt_EGREP +int +main () +{ --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS +-# The linker used to build libraries. +-LD=$lt_LD + ; + return 0; +} @@ -44889,39 +42956,39 @@ index a9c2177..db327e8 100755 + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir --# A C compiler. --LTCC=$lt_LTCC +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +fi --# A language-specific compiler. --CC=$lt_compiler +-# A BSD-compatible nm program. +-NM=$lt_NM + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath --# Is the compiler the GNU C compiler? --with_gcc=$GCC +-# A symbol stripping program +-STRIP=$lt_STRIP + # 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 --# An ERE matcher. --EGREP=$lt_EGREP +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" --# The linker used to build libraries. --LD=$lt_LD +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" + # 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" --# Whether we need hard or soft links. --LN_S=$lt_LN_S +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" + fi --# A BSD-compatible nm program. --NM=$lt_NM +-# Used on cygwin: assembler. +-AS="$AS" + # 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, @@ -44931,8 +42998,8 @@ index a9c2177..db327e8 100755 + dynamic_linker='GNU/Linux ld.so' + ;; --# A symbol stripping program --STRIP=$lt_STRIP +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +netbsd*) + version_type=sunos + need_lib_prefix=no @@ -44951,8 +43018,9 @@ index a9c2177..db327e8 100755 + hardcode_into_libs=yes + ;; --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +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}' @@ -44960,8 +43028,8 @@ index a9c2177..db327e8 100755 + shlibpath_overrides_runpath=yes + ;; --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no @@ -44974,8 +43042,8 @@ index a9c2177..db327e8 100755 + dynamic_linker='ldqnx.so' + ;; --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" +-# Object file suffix (normally "o"). +-objext="$ac_objext" +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" @@ -45002,8 +43070,8 @@ index a9c2177..db327e8 100755 + fi + ;; --# Used on cygwin: assembler. --AS="$AS" +-# Old archive suffix (normally "a"). +-libext="$libext" +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -45013,8 +43081,8 @@ index a9c2177..db327e8 100755 + shlibpath_var=LIBPATH + ;; --# The name of the directory that contains temporary libtool files. --objdir=$objdir +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no @@ -45026,15 +43094,15 @@ index a9c2177..db327e8 100755 + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds +-# Executable file suffix (normally ""). +-exeext="$exeext" +rdos*) + dynamic_linker=no + ;; --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +-pic_mode=$pic_mode +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no @@ -45048,8 +43116,8 @@ index a9c2177..db327e8 100755 + postinstall_cmds='chmod +x $lib' + ;; --# Object file suffix (normally "o"). --objext="$ac_objext" +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -45062,8 +43130,8 @@ index a9c2177..db327e8 100755 + need_version=yes + ;; --# Old archive suffix (normally "a"). --libext="$libext" +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +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}' @@ -45087,8 +43155,8 @@ index a9c2177..db327e8 100755 + esac + ;; --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor @@ -45098,8 +43166,8 @@ index a9c2177..db327e8 100755 + fi + ;; --# Executable file suffix (normally ""). --exeext="$exeext" +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no @@ -45122,9 +43190,8 @@ index a9c2177..db327e8 100755 + sys_lib_dlsearch_path_spec='/usr/lib' + ;; --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic --pic_mode=$pic_mode +-# Do we need a version for libraries? +-need_version=$need_version +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor @@ -45136,8 +43203,8 @@ index a9c2177..db327e8 100755 + hardcode_into_libs=yes + ;; --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +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}' @@ -45145,8 +43212,8 @@ index a9c2177..db327e8 100755 + shlibpath_var=LD_LIBRARY_PATH + ;; --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +*) + dynamic_linker=no + ;; @@ -45155,13 +43222,15 @@ index a9c2177..db327e8 100755 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no --# Must we lock files when doing compilation? --need_locks=$lt_need_locks +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +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 +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 @@ -45169,24 +43238,6 @@ index a9c2177..db327e8 100755 + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix - --# Do we need a version for libraries? --need_version=$need_version - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen - --# 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 @@ -45520,12 +43571,6 @@ index a9c2177..db327e8 100755 -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -+ { $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 -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" @@ -45553,6 +43598,18 @@ index a9c2177..db327e8 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 @@ -46491,7 +44548,7 @@ index a9c2177..db327e8 100755 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -12055,48 +14042,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -12055,57 +14002,36 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" @@ -46536,16 +44593,17 @@ index a9c2177..db327e8 100755 + ac_config_commands="$ac_config_commands libtool" -+ -+ + + +# Only expand once: + - - ++ ++ ol_link_perl=no -@@ -12105,7 +14071,7 @@ if test $ol_enable_perl != no ; then + if test $ol_enable_perl != no ; then + # Extract the first word of "perl", so it can be a program name with args. 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; } @@ -46554,16 +44612,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else case $PERLBIN in -@@ -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 +@@ -12145,7 +14071,7 @@ fi if test "no$PERLBIN" = "no" ; then if test $ol_enable_perl = yes ; then @@ -46572,7 +44621,7 @@ index a9c2177..db327e8 100755 fi else -@@ -12173,7 +14139,7 @@ if test -n "$CPP" && test -d "$CPP"; then +@@ -12173,7 +14099,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then @@ -46581,7 +44630,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -12203,7 +14169,7 @@ else +@@ -12203,7 +14129,7 @@ else # Broken: fails on valid input. continue fi @@ -46590,7 +44639,7 @@ index a9c2177..db327e8 100755 # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. -@@ -12219,11 +14185,11 @@ else +@@ -12219,11 +14145,11 @@ else ac_preproc_ok=: break fi @@ -46604,7 +44653,7 @@ index a9c2177..db327e8 100755 if $ac_preproc_ok; then : break fi -@@ -12262,7 +14228,7 @@ else +@@ -12262,7 +14188,7 @@ else # Broken: fails on valid input. continue fi @@ -46613,7 +44662,7 @@ index a9c2177..db327e8 100755 # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. -@@ -12278,18 +14244,18 @@ else +@@ -12278,18 +14204,18 @@ else ac_preproc_ok=: break fi @@ -46636,7 +44685,7 @@ index a9c2177..db327e8 100755 fi ac_ext=c -@@ -12300,7 +14266,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -12300,7 +14226,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; } @@ -46645,7 +44694,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12316,7 +14282,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : +@@ -12316,7 +14242,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_msvc=no fi @@ -46654,7 +44703,7 @@ index a9c2177..db327e8 100755 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_msvc" >&5 $as_echo "$ol_cv_msvc" >&6; } -@@ -12337,7 +14303,7 @@ _ACEOF +@@ -12337,7 +14263,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; } @@ -46663,7 +44712,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -12371,7 +14337,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -12371,7 +14297,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; } @@ -46672,7 +44721,7 @@ index a9c2177..db327e8 100755 LIBS="$LIBS -lbe -lroot -lnet" else : -@@ -12388,7 +14354,7 @@ if test -n "$ac_tool_prefix"; then +@@ -12388,7 +14314,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; } @@ -46681,16 +44730,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$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 +@@ -12428,7 +14354,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; } @@ -46699,16 +44739,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_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 +@@ -12481,7 +14407,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; } @@ -46717,16 +44748,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$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 +@@ -12521,7 +14447,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; } @@ -46735,16 +44757,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$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 +@@ -12580,7 +14506,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; } @@ -46753,16 +44766,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -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 +@@ -12624,7 +14550,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; } @@ -46771,16 +44775,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -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 +@@ -12678,8 +14604,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;} @@ -46791,7 +44786,7 @@ index a9c2177..db327e8 100755 # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -@@ -12708,7 +14674,7 @@ done +@@ -12708,7 +14634,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; } @@ -46800,7 +44795,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12745,7 +14711,7 @@ ac_test_CFLAGS=${CFLAGS+set} +@@ -12745,7 +14671,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; } @@ -46809,7 +44804,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag -@@ -12823,7 +14789,7 @@ else +@@ -12823,7 +14749,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; } @@ -46818,17 +44813,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no -@@ -12832,8 +14798,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+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= +@@ -12922,7 +14848,7 @@ depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } @@ -46837,18 +44822,15 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For +@@ -12931,6 +14857,7 @@ else # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # 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 +14914,11 @@ else +@@ -12948,6 +14875,11 @@ else if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi @@ -46860,23 +44842,14 @@ index a9c2177..db327e8 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 -@@ -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 +@@ -12965,7 +14897,17 @@ else 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 @@ -46885,18 +44858,14 @@ index a9c2177..db327e8 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 + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -12975,18 +14917,23 @@ 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} @@ -46921,7 +44890,7 @@ index a9c2177..db327e8 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 +15000,7 @@ fi +@@ -13014,9 +14961,7 @@ fi $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -46932,7 +44901,7 @@ index a9c2177..db327e8 100755 test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= -@@ -13028,7 +15012,7 @@ fi +@@ -13028,7 +14973,7 @@ fi if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then @@ -46941,7 +44910,7 @@ index a9c2177..db327e8 100755 fi # test for make depend flag -@@ -13039,7 +15023,7 @@ if test -z "${MKDEP}"; then +@@ -13039,7 +14984,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; } @@ -46950,7 +44919,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -13089,7 +15073,7 @@ fi +@@ -13089,7 +15034,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for afopen in -ls" >&5 $as_echo_n "checking for afopen in -ls... " >&6; } @@ -46959,7 +44928,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -13123,7 +15107,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -13123,7 +15068,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; } @@ -46968,7 +44937,7 @@ index a9c2177..db327e8 100755 AUTH_LIBS=-ls -@@ -13148,7 +15132,7 @@ if test $ol_enable_modules != no ; then +@@ -13148,7 +15093,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" @@ -46977,7 +44946,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LTDL_H 1 _ACEOF -@@ -13159,12 +15143,12 @@ done +@@ -13159,12 +15104,12 @@ done if test $ac_cv_header_ltdl_h = no ; then @@ -46992,7 +44961,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -13198,7 +15182,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -13198,7 +15143,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; } @@ -47001,7 +44970,7 @@ index a9c2177..db327e8 100755 MODULES_LIBS=-lltdl -@@ -13209,7 +15193,7 @@ fi +@@ -13209,7 +15154,7 @@ fi if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then @@ -47010,7 +44979,7 @@ index a9c2177..db327e8 100755 fi ol_link_modules=yes WITH_MODULES_ENABLED=yes -@@ -13236,7 +15220,7 @@ fi +@@ -13236,7 +15181,7 @@ fi # test for EBCDIC { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EBCDIC" >&5 $as_echo_n "checking for EBCDIC... " >&6; } @@ -47019,7 +44988,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -13253,7 +15237,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : +@@ -13253,7 +15198,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_cpp_ebcdic=no fi @@ -47028,7 +44997,7 @@ index a9c2177..db327e8 100755 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_cpp_ebcdic" >&5 $as_echo "$ol_cv_cpp_ebcdic" >&6; } -@@ -13265,7 +15249,7 @@ fi +@@ -13265,7 +15210,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; } @@ -47037,7 +45006,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13280,7 +15264,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : +@@ -13280,7 +15225,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_header_stdc=no fi @@ -47046,7 +45015,7 @@ index a9c2177..db327e8 100755 if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -13369,7 +15353,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +@@ -13369,7 +15314,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; } @@ -47055,7 +45024,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13396,8 +15380,7 @@ fi +@@ -13396,8 +15341,7 @@ fi eval ac_res=\$$as_ac_Header { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -47065,7 +45034,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF -@@ -13410,7 +15393,7 @@ done +@@ -13410,7 +15354,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; } @@ -47074,7 +45043,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -13444,11 +15427,11 @@ for ac_lib in '' dir; do +@@ -13444,11 +15388,11 @@ for ac_lib in '' dir; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47088,7 +45057,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_opendir=no -@@ -13467,7 +15450,7 @@ fi +@@ -13467,7 +15411,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; } @@ -47097,7 +45066,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -13501,11 +15484,11 @@ for ac_lib in '' x; do +@@ -13501,11 +15445,11 @@ for ac_lib in '' x; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47111,7 +45080,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_opendir=no -@@ -13525,7 +15508,7 @@ fi +@@ -13525,7 +15469,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; } @@ -47120,7 +45089,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13566,7 +15549,7 @@ fi +@@ -13566,7 +15510,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; } @@ -47129,7 +45098,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13593,7 +15576,7 @@ $as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; } +@@ -13593,7 +15537,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; } @@ -47138,7 +45107,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13677,8 +15660,7 @@ for ac_header in \ +@@ -13677,8 +15621,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" @@ -47148,7 +45117,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -13696,8 +15678,7 @@ then +@@ -13696,8 +15639,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" @@ -47158,7 +45127,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -13714,7 +15695,7 @@ do : +@@ -13714,7 +15656,7 @@ do : #include " @@ -47167,7 +45136,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_RESOLV_H 1 _ACEOF -@@ -13730,7 +15711,7 @@ do : +@@ -13730,7 +15672,7 @@ do : #include " @@ -47176,7 +45145,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_NETINET_TCP_H 1 _ACEOF -@@ -13748,7 +15729,7 @@ do : +@@ -13748,7 +15690,7 @@ do : #endif " @@ -47185,7 +45154,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_SYS_UCRED_H 1 _ACEOF -@@ -13763,8 +15744,7 @@ for ac_func in sigaction sigset +@@ -13763,8 +15705,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" @@ -47195,7 +45164,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -13776,7 +15756,7 @@ done +@@ -13776,7 +15717,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; } @@ -47204,7 +45173,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -13810,7 +15790,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -13810,7 +15751,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; } @@ -47213,7 +45182,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBV3 1 _ACEOF -@@ -13828,7 +15808,7 @@ fi +@@ -13828,7 +15769,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; } @@ -47222,7 +45191,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -13893,13 +15873,13 @@ fi +@@ -13893,13 +15834,13 @@ fi ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" @@ -47238,7 +45207,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -13927,7 +15907,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -13927,7 +15868,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; } @@ -47247,7 +45216,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF -@@ -13938,7 +15918,7 @@ fi +@@ -13938,7 +15879,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnet" >&5 $as_echo_n "checking for socket in -lnet... " >&6; } @@ -47256,7 +45225,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -13972,7 +15952,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -13972,7 +15913,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; } @@ -47265,7 +45234,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBNET 1 _ACEOF -@@ -13983,7 +15963,7 @@ fi +@@ -13983,7 +15924,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; } @@ -47274,7 +45243,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -14011,7 +15991,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -14011,7 +15952,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; } @@ -47283,7 +45252,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL_S 1 _ACEOF -@@ -14022,7 +16002,7 @@ fi +@@ -14022,7 +15963,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5 $as_echo_n "checking for main in -lnsl... " >&6; } @@ -47292,7 +45261,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -14050,7 +16030,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -14050,7 +15991,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; } @@ -47301,7 +45270,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 _ACEOF -@@ -14061,7 +16041,7 @@ fi +@@ -14061,7 +16002,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -linet" >&5 $as_echo_n "checking for socket in -linet... " >&6; } @@ -47310,7 +45279,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -14095,7 +16075,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -14095,7 +16036,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; } @@ -47319,7 +45288,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBINET 1 _ACEOF -@@ -14106,7 +16086,7 @@ fi +@@ -14106,7 +16047,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgen" >&5 $as_echo_n "checking for main in -lgen... " >&6; } @@ -47328,7 +45297,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -14134,7 +16114,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -14134,7 +16075,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; } @@ -47337,7 +45306,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBGEN 1 _ACEOF -@@ -14148,10 +16128,10 @@ fi +@@ -14148,10 +16089,10 @@ fi ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" @@ -47350,7 +45319,7 @@ index a9c2177..db327e8 100755 fi -@@ -14160,8 +16140,7 @@ if test "${ac_cv_header_winsock_h}" != yes; then +@@ -14160,8 +16101,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" @@ -47360,7 +45329,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -14172,7 +16151,7 @@ done +@@ -14172,7 +16112,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; } @@ -47369,7 +45338,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else for ac_arg234 in 'fd_set *' 'int *' 'void *'; do -@@ -14206,7 +16185,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +@@ -14206,7 +16146,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done done # Provide a safe default value. @@ -47378,7 +45347,7 @@ index a9c2177..db327e8 100755 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 -@@ -14239,8 +16218,7 @@ for ac_func in poll +@@ -14239,8 +16179,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" @@ -47388,7 +45357,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -14253,8 +16231,7 @@ for ac_header in poll.h sys/poll.h +@@ -14253,8 +16192,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" @@ -47398,7 +45367,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -14269,8 +16246,7 @@ for ac_header in sys/epoll.h +@@ -14269,8 +16207,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" @@ -47408,7 +45377,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -14314,8 +16290,7 @@ for ac_header in sys/devpoll.h +@@ -14314,8 +16251,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" @@ -47418,7 +45387,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -14359,7 +16334,7 @@ fi +@@ -14359,7 +16295,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking declaration of sys_errlist" >&5 $as_echo_n "checking declaration of sys_errlist... " >&6; } @@ -47427,7 +45396,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14399,7 +16374,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h +@@ -14399,7 +16335,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; } @@ -47436,7 +45405,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14434,8 +16409,7 @@ fi +@@ -14434,8 +16370,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" @@ -47446,7 +45415,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -14447,7 +16421,7 @@ ol_cv_func_strerror_r=no +@@ -14447,7 +16382,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; } @@ -47455,7 +45424,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14523,7 +16497,7 @@ fi +@@ -14523,7 +16458,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; } @@ -47464,7 +45433,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14563,7 +16537,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h +@@ -14563,7 +16498,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; } @@ -47473,7 +45442,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14606,7 +16580,7 @@ do : +@@ -14606,7 +16541,7 @@ do : #endif " @@ -47482,7 +45451,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_REGEX_H 1 _ACEOF -@@ -14617,11 +16591,11 @@ done +@@ -14617,11 +16552,11 @@ done if test "$ac_cv_header_regex_h" != yes ; then @@ -47496,7 +45465,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -14655,11 +16629,11 @@ for ac_lib in '' regex gnuregex; do +@@ -14655,11 +16590,11 @@ for ac_lib in '' regex gnuregex; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47510,7 +45479,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_regfree=no -@@ -14674,14 +16648,14 @@ if test "$ac_res" != no; then : +@@ -14674,14 +16609,14 @@ if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" : else @@ -47527,7 +45496,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -14728,7 +16702,7 @@ fi +@@ -14728,7 +16663,7 @@ fi $as_echo "$ol_cv_c_posix_regex" >&6; } if test "$ol_cv_c_posix_regex" = no ; then @@ -47536,7 +45505,7 @@ index a9c2177..db327e8 100755 fi -@@ -14736,7 +16710,7 @@ have_uuid=no +@@ -14736,7 +16671,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" @@ -47545,7 +45514,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_SYS_UUID_H 1 _ACEOF -@@ -14749,7 +16723,7 @@ if test $ac_cv_header_sys_uuid_h = yes ; then +@@ -14749,7 +16684,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; } @@ -47554,7 +45523,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -14783,11 +16757,11 @@ for ac_lib in '' uuid; do +@@ -14783,11 +16718,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47568,7 +45537,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_uuid_to_str=no -@@ -14807,7 +16781,7 @@ fi +@@ -14807,7 +16742,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; } @@ -47577,7 +45546,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -14841,11 +16815,11 @@ for ac_lib in '' uuid; do +@@ -14841,11 +16776,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47591,7 +45560,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_uuid_create=no -@@ -14879,7 +16853,7 @@ if test $have_uuid = no ; then +@@ -14879,7 +16814,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" @@ -47600,7 +45569,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_UUID_UUID_H 1 _ACEOF -@@ -14892,7 +16866,7 @@ done +@@ -14892,7 +16827,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; } @@ -47609,7 +45578,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -14926,11 +16900,11 @@ for ac_lib in '' uuid; do +@@ -14926,11 +16861,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47623,7 +45592,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_uuid_generate=no -@@ -14950,7 +16924,7 @@ fi +@@ -14950,7 +16885,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; } @@ -47632,7 +45601,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -14984,11 +16958,11 @@ for ac_lib in '' uuid; do +@@ -14984,11 +16919,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -47646,7 +45615,7 @@ index a9c2177..db327e8 100755 else ac_cv_search_uuid_unparse_lower=no -@@ -15060,7 +17034,7 @@ ol_cv_lib_resolver=no +@@ -15060,7 +16995,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; } @@ -47655,7 +45624,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15141,7 +17115,7 @@ fi +@@ -15141,7 +17076,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; } @@ -47664,7 +45633,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15222,7 +17196,7 @@ fi +@@ -15222,7 +17157,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; } @@ -47673,7 +45642,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15319,7 +17293,7 @@ fi +@@ -15319,7 +17254,7 @@ fi if test "$ol_enable_dnssrv" = yes || test "$ol_enable_dnssrv" = mod ; then if test "$ol_link_dnssrv" = no ; then @@ -47682,7 +45651,7 @@ index a9c2177..db327e8 100755 fi else ol_enable_dnssrv=no -@@ -15329,8 +17303,7 @@ for ac_func in hstrerror +@@ -15329,8 +17264,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" @@ -47692,7 +45661,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15343,8 +17316,7 @@ for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop +@@ -15343,8 +17277,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" @@ -47702,7 +45671,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15356,12 +17328,12 @@ done +@@ -15356,12 +17289,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 @@ -47717,7 +45686,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15389,7 +17361,7 @@ $as_echo "$ol_cv_inet6_addrstrlen" >&6; } +@@ -15389,7 +17322,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; } @@ -47726,7 +45695,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15424,10 +17396,10 @@ $as_echo "$ol_cv_struct_sockaddr_storage" >&6; } +@@ -15424,10 +17357,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 @@ -47739,7 +45708,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -15436,8 +17408,7 @@ if test $ol_enable_local != no ; then +@@ -15436,8 +17369,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" @@ -47749,7 +45718,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -15450,7 +17421,7 @@ done +@@ -15450,7 +17382,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 @@ -47758,7 +45727,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -15464,7 +17435,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then +@@ -15464,7 +17396,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" @@ -47767,7 +45736,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_SSL_H 1 _ACEOF -@@ -15477,7 +17448,7 @@ done +@@ -15477,7 +17409,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; } @@ -47776,7 +45745,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -15511,7 +17482,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -15511,7 +17443,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; } @@ -47785,7 +45754,7 @@ index a9c2177..db327e8 100755 have_openssl=yes need_rsaref=no else -@@ -15522,7 +17493,7 @@ fi +@@ -15522,7 +17454,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; } @@ -47794,7 +45763,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -15556,7 +17527,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -15556,7 +17488,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; } @@ -47803,7 +45772,7 @@ index a9c2177..db327e8 100755 have_openssl=yes need_rsaref=yes else -@@ -15585,7 +17556,7 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h +@@ -15585,7 +17517,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; } @@ -47812,7 +45781,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15628,7 +17599,7 @@ if test $ol_link_tls = no ; then +@@ -15628,7 +17560,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" @@ -47821,7 +45790,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_GNUTLS_GNUTLS_H 1 _ACEOF -@@ -15641,7 +17612,7 @@ done +@@ -15641,7 +17573,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; } @@ -47830,7 +45799,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -15675,7 +17646,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -15675,7 +17607,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; } @@ -47839,22 +45808,19 @@ index a9c2177..db327e8 100755 have_gnutls=yes else have_gnutls=no -@@ -15689,82 +17660,215 @@ fi - TLS_LIBS="-lgnutls" +@@ -15698,75 +17630,203 @@ 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 --$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 -+ -+ + + + @@ -47880,7 +45846,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -47923,7 +45889,7 @@ index a9c2177..db327e8 100755 + 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -47958,9 +45924,7 @@ index a9c2177..db327e8 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 @@ -47973,23 +45937,13 @@ index a9c2177..db327e8 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" - 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 ++ fi ++fi ++ +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 @@ -48000,7 +45954,6 @@ index a9c2177..db327e8 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 @@ -48017,7 +45970,6 @@ index a9c2177..db327e8 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 @@ -48074,9 +46026,9 @@ index a9c2177..db327e8 100755 -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 --cflags --libs "nss nspr" 2>&1` ++ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss nspr" 2>&1` + else -+ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss nspr" 2>&1` ++ MOZNSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss nspr" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOZNSS_PKG_ERRORS" >&5 @@ -48106,13 +46058,15 @@ index a9c2177..db327e8 100755 - TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" - else +- if test $ol_with_tls = moznss ; then - as_fn_error "MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)" "$LINENO" 5 +- fi + TLS_LIBS="$MOZNSS_LIBS" + CFLAGS="$CFLAGS $MOZNSS_CFLAGS" fi fi fi -@@ -15781,7 +17885,7 @@ $as_echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;} +@@ -15783,7 +17843,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 @@ -48121,7 +46075,7 @@ index a9c2177..db327e8 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;} -@@ -15789,7 +17893,7 @@ fi +@@ -15791,7 +17851,7 @@ fi if test $ol_enable_lmpasswd != no; then if test $ol_link_tls != yes ; then @@ -48130,7 +46084,7 @@ index a9c2177..db327e8 100755 fi -@@ -15803,7 +17907,7 @@ case $ol_with_threads in auto | yes | nt) +@@ -15805,7 +17865,7 @@ case $ol_with_threads in auto | yes | nt) ac_fn_c_check_func "$LINENO" "_beginthread" "ac_cv_func__beginthread" @@ -48139,7 +46093,7 @@ index a9c2177..db327e8 100755 fi -@@ -15830,7 +17934,7 @@ $as_echo "#define HAVE_NT_EVENT_LOG 1" >>confdefs.h +@@ -15832,7 +17892,7 @@ $as_echo "#define HAVE_NT_EVENT_LOG 1" >>confdefs.h fi if test $ol_with_threads = nt ; then @@ -48148,7 +46102,7 @@ index a9c2177..db327e8 100755 fi ;; esac -@@ -15840,7 +17944,7 @@ case $ol_with_threads in auto | yes | posix) +@@ -15842,7 +17902,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" @@ -48157,7 +46111,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_H 1 _ACEOF -@@ -15853,7 +17957,7 @@ done +@@ -15855,7 +17915,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; } @@ -48166,7 +46120,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -15951,7 +18055,7 @@ cat >>confdefs.h <<_ACEOF +@@ -15953,7 +18013,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF else @@ -48175,7 +46129,7 @@ index a9c2177..db327e8 100755 fi # consider threads found -@@ -15960,7 +18064,7 @@ _ACEOF +@@ -15962,7 +18022,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5 $as_echo_n "checking for LinuxThreads pthread.h... " >&6; } @@ -48184,7 +46138,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15988,7 +18092,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h +@@ -15990,7 +18050,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; } @@ -48193,7 +46147,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -16017,7 +18121,7 @@ $as_echo "$ol_cv_header_gnu_pth_pthread_h" >&6; } +@@ -16019,7 +18079,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" @@ -48202,7 +46156,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_SCHED_H 1 _ACEOF -@@ -16031,7 +18135,7 @@ done +@@ -16033,7 +18093,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; } @@ -48211,7 +46165,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -16212,7 +18316,7 @@ if test "$ol_link_threads" = no ; then +@@ -16214,7 +18274,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; } @@ -48220,7 +46174,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -16402,7 +18506,7 @@ if test "$ol_link_threads" = no ; then +@@ -16404,7 +18464,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; } @@ -48229,7 +46183,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -16592,7 +18696,7 @@ if test "$ol_link_threads" = no ; then +@@ -16594,7 +18654,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; } @@ -48238,7 +46192,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -16782,7 +18886,7 @@ if test "$ol_link_threads" = no ; then +@@ -16784,7 +18844,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; } @@ -48247,7 +46201,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -16972,7 +19076,7 @@ if test "$ol_link_threads" = no ; then +@@ -16974,7 +19034,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; } @@ -48256,7 +46210,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -17163,7 +19267,7 @@ if test "$ol_link_threads" = no ; then +@@ -17165,7 +19225,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; } @@ -48265,7 +46219,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -17353,7 +19457,7 @@ if test "$ol_link_threads" = no ; then +@@ -17355,7 +19415,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; } @@ -48274,7 +46228,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -17544,7 +19648,7 @@ if test "$ol_link_threads" = no ; then +@@ -17546,7 +19606,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; } @@ -48283,7 +46237,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -17735,7 +19839,7 @@ if test "$ol_link_threads" = no ; then +@@ -17737,7 +19797,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; } @@ -48292,7 +46246,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -17925,7 +20029,7 @@ if test "$ol_link_threads" = no ; then +@@ -17927,7 +19987,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; } @@ -48301,7 +46255,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -18116,7 +20220,7 @@ if test "$ol_link_threads" = no ; then +@@ -18118,7 +20178,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; } @@ -48310,7 +46264,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -18307,7 +20411,7 @@ if test "$ol_link_threads" = no ; then +@@ -18309,7 +20369,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; } @@ -48319,7 +46273,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -18497,7 +20601,7 @@ if test "$ol_link_threads" = no ; then +@@ -18499,7 +20559,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; } @@ -48328,7 +46282,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -18687,7 +20791,7 @@ if test "$ol_link_threads" = no ; then +@@ -18689,7 +20749,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; } @@ -48337,7 +46291,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -18878,7 +20982,7 @@ if test "$ol_link_threads" = no ; then +@@ -18880,7 +20940,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; } @@ -48346,7 +46300,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19075,8 +21179,7 @@ fi +@@ -19077,8 +21137,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" @@ -48356,7 +46310,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19090,7 +21193,7 @@ done +@@ -19092,7 +21151,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; } @@ -48365,7 +46319,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -19124,7 +21227,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -19126,7 +21185,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; } @@ -48374,7 +46328,7 @@ index a9c2177..db327e8 100755 LTHREAD_LIBS="$LTHREAD_LIBS -lrt" $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h -@@ -19145,7 +21248,7 @@ $as_echo "$as_me: WARNING: could not locate sched_yield() or pthread_yield()" >& +@@ -19147,7 +21206,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" @@ -48383,7 +46337,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_KILL 1 _ACEOF -@@ -19156,7 +21259,7 @@ done +@@ -19158,7 +21217,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_destroy with " >&5 $as_echo_n "checking for pthread_rwlock_destroy with ... " >&6; } @@ -48392,7 +46346,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19193,7 +21296,7 @@ $as_echo "#define HAVE_PTHREAD_RWLOCK_DESTROY 1" >>confdefs.h +@@ -19195,7 +21254,7 @@ $as_echo "#define HAVE_PTHREAD_RWLOCK_DESTROY 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_detach with " >&5 $as_echo_n "checking for pthread_detach with ... " >&6; } @@ -48401,7 +46355,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19226,7 +21329,7 @@ fi +@@ -19228,7 +21287,7 @@ fi $as_echo "$ol_cv_func_pthread_detach" >&6; } if test $ol_cv_func_pthread_detach = no ; then @@ -48410,7 +46364,7 @@ index a9c2177..db327e8 100755 fi -@@ -19242,8 +21345,7 @@ $as_echo "#define HAVE_PTHREAD_DETACH 1" >>confdefs.h +@@ -19244,8 +21303,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" @@ -48420,7 +46374,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19256,7 +21358,7 @@ done +@@ -19258,7 +21316,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" @@ -48429,7 +46383,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_KILL_OTHER_THREADS_NP 1 _ACEOF -@@ -19266,7 +21368,7 @@ done +@@ -19268,7 +21326,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads implementation" >&5 $as_echo_n "checking for LinuxThreads implementation... " >&6; } @@ -48438,7 +46392,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np -@@ -19279,7 +21381,7 @@ $as_echo "$ol_cv_sys_linux_threads" >&6; } +@@ -19281,7 +21339,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; } @@ -48447,7 +46401,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19299,12 +21401,12 @@ $as_echo "$ol_cv_linux_threads" >&6; } +@@ -19301,12 +21359,12 @@ $as_echo "$ol_cv_linux_threads" >&6; } if test $ol_cv_linux_threads = error; then @@ -48462,7 +46416,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19398,7 +21500,7 @@ fi +@@ -19400,7 +21458,7 @@ fi $as_echo "$ol_cv_pthread_create_works" >&6; } if test $ol_cv_pthread_create_works = no ; then @@ -48471,7 +46425,7 @@ index a9c2177..db327e8 100755 fi ol_replace_broken_yield=no -@@ -19412,7 +21514,7 @@ $as_echo "#define REPLACE_BROKEN_YIELD 1" >>confdefs.h +@@ -19414,7 +21472,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; } @@ -48480,7 +46434,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19510,7 +21612,7 @@ fi +@@ -19512,7 +21570,7 @@ fi $as_echo "$ol_cv_pthread_select_yields" >&6; } if test $ol_cv_pthread_select_yields = cross ; then @@ -48489,7 +46443,7 @@ index a9c2177..db327e8 100755 fi if test $ol_cv_pthread_select_yields = yes ; then -@@ -19521,12 +21623,12 @@ $as_echo "$ol_cv_pthread_select_yields" >&6; } +@@ -19523,12 +21581,12 @@ $as_echo "$ol_cv_pthread_select_yields" >&6; } CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" else @@ -48504,7 +46458,7 @@ index a9c2177..db327e8 100755 fi ;; esac -@@ -19537,8 +21639,7 @@ case $ol_with_threads in auto | yes | mach) +@@ -19539,8 +21597,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" @@ -48514,7 +46468,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -19551,7 +21652,7 @@ done +@@ -19553,7 +21610,7 @@ done ol_with_threads=found ac_fn_c_check_func "$LINENO" "cthread_fork" "ac_cv_func_cthread_fork" @@ -48523,7 +46477,7 @@ index a9c2177..db327e8 100755 ol_link_threads=yes fi -@@ -19559,7 +21660,7 @@ fi +@@ -19561,7 +21618,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; } @@ -48532,7 +46486,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19605,7 +21706,7 @@ $as_echo "$ol_cv_cthread_all_load" >&6; } +@@ -19607,7 +21664,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" @@ -48541,7 +46495,7 @@ index a9c2177..db327e8 100755 ol_link_threads=yes fi -@@ -19616,11 +21717,11 @@ fi +@@ -19618,11 +21675,11 @@ fi ol_link_threads=mach ol_with_threads=found else @@ -48555,7 +46509,7 @@ index a9c2177..db327e8 100755 fi if test $ol_link_threads = mach ; then -@@ -19628,7 +21729,7 @@ fi +@@ -19630,7 +21687,7 @@ fi $as_echo "#define HAVE_MACH_CTHREADS 1" >>confdefs.h elif test $ol_with_threads = found ; then @@ -48564,7 +46518,7 @@ index a9c2177..db327e8 100755 fi ;; esac -@@ -19638,7 +21739,7 @@ case $ol_with_threads in auto | yes | pth) +@@ -19640,7 +21697,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" @@ -48573,7 +46527,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_PTH_H 1 _ACEOF -@@ -19651,7 +21752,7 @@ done +@@ -19653,7 +21710,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; } @@ -48582,7 +46536,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -19685,7 +21786,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -19687,7 +21744,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; } @@ -48591,7 +46545,7 @@ index a9c2177..db327e8 100755 have_pth=yes else have_pth=no -@@ -19714,8 +21815,7 @@ case $ol_with_threads in auto | yes | lwp) +@@ -19716,8 +21773,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" @@ -48601,7 +46555,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -19728,7 +21828,7 @@ done +@@ -19730,7 +21786,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; } @@ -48610,7 +46564,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -19762,7 +21862,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -19764,7 +21820,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; } @@ -48619,7 +46573,7 @@ index a9c2177..db327e8 100755 have_thr=yes else have_thr=no -@@ -19787,8 +21887,7 @@ $as_echo "#define HAVE_THR 1" >>confdefs.h +@@ -19789,8 +21845,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" @@ -48629,7 +46583,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19817,8 +21916,7 @@ $as_echo "$as_me: WARNING: thread defines and link options must be set manually" +@@ -19819,8 +21874,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" @@ -48639,7 +46593,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -19831,8 +21929,7 @@ done +@@ -19833,8 +21887,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" @@ -48649,7 +46603,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19843,7 +21940,7 @@ done +@@ -19845,7 +21898,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5 $as_echo_n "checking for LinuxThreads pthread.h... " >&6; } @@ -48658,7 +46612,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -19872,7 +21969,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h +@@ -19874,7 +21927,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" @@ -48667,7 +46621,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_MACH_CTHREADS_H 1 _ACEOF -@@ -19885,8 +21982,7 @@ done +@@ -19887,8 +21940,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" @@ -48677,7 +46631,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -19915,7 +22011,7 @@ if test $ol_link_threads != no && test $ol_link_threads != nt ; then +@@ -19917,7 +21969,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; } @@ -48686,7 +46640,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19944,7 +22040,7 @@ $as_echo "$ol_cv_errno_thread_specific" >&6; } +@@ -19946,7 +21998,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; } @@ -48695,7 +46649,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -19981,7 +22077,7 @@ fi +@@ -19983,7 +22035,7 @@ fi if test $ol_link_threads = no ; then if test $ol_with_threads = yes ; then @@ -48704,7 +46658,7 @@ index a9c2177..db327e8 100755 fi if test $ol_with_threads = auto ; then -@@ -20013,8 +22109,7 @@ for ac_func in \ +@@ -20015,8 +22067,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" @@ -48714,7 +46668,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -20028,7 +22123,7 @@ if test "$ac_cv_func_ctime_r" = no ; then +@@ -20030,7 +22081,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; } @@ -48723,7 +46677,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -20098,7 +22193,7 @@ fi +@@ -20100,7 +22151,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; } @@ -48732,7 +46686,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -20184,7 +22279,7 @@ fi +@@ -20186,7 +22237,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; } @@ -48741,7 +46695,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -20279,7 +22374,7 @@ if test $ol_enable_bdb/$ol_enable_hdb != no/no; then +@@ -20281,7 +22332,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" @@ -48750,7 +46704,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_DB_H 1 _ACEOF -@@ -20291,7 +22386,7 @@ done +@@ -20293,7 +22344,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; } @@ -48759,7 +46713,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20312,12 +22407,12 @@ fi +@@ -20314,12 +22365,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]*) : ;; *) @@ -48774,7 +46728,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20338,12 +22433,12 @@ fi +@@ -20340,12 +22391,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]*) : ;; *) @@ -48789,7 +46743,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20382,7 +22477,7 @@ $as_echo "$ol_cv_bdb_compat" >&6; } +@@ -20384,7 +22435,7 @@ $as_echo "$ol_cv_bdb_compat" >&6; } if test $ol_cv_bdb_compat != yes ; then @@ -48798,7 +46752,7 @@ index a9c2177..db327e8 100755 fi ol_cv_lib_db=no -@@ -20391,7 +22486,7 @@ if test $ol_cv_bdb_major = 5 ; then +@@ -20393,7 +22444,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; } @@ -48807,7 +46761,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20454,7 +22549,7 @@ fi +@@ -20456,7 +22507,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; } @@ -48816,7 +46770,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20517,7 +22612,7 @@ fi +@@ -20519,7 +22570,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; } @@ -48825,7 +46779,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20580,7 +22675,7 @@ fi +@@ -20582,7 +22633,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; } @@ -48834,7 +46788,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20643,7 +22738,7 @@ fi +@@ -20645,7 +22696,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; } @@ -48843,7 +46797,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20706,7 +22801,7 @@ fi +@@ -20708,7 +22759,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; } @@ -48852,7 +46806,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20770,7 +22865,7 @@ elif test $ol_cv_bdb_major = 4 ; then +@@ -20772,7 +22823,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; } @@ -48861,7 +46815,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20833,7 +22928,7 @@ fi +@@ -20835,7 +22886,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; } @@ -48870,7 +46824,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20896,7 +22991,7 @@ fi +@@ -20898,7 +22949,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; } @@ -48879,7 +46833,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -20959,7 +23054,7 @@ fi +@@ -20961,7 +23012,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; } @@ -48888,7 +46842,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21022,7 +23117,7 @@ fi +@@ -21024,7 +23075,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; } @@ -48897,7 +46851,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21085,7 +23180,7 @@ fi +@@ -21087,7 +23138,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; } @@ -48906,7 +46860,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21149,7 +23244,7 @@ fi +@@ -21151,7 +23202,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; } @@ -48915,7 +46869,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21212,7 +23307,7 @@ fi +@@ -21214,7 +23265,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; } @@ -48924,7 +46878,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21277,7 +23372,7 @@ fi +@@ -21279,7 +23330,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; } @@ -48933,7 +46887,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21343,12 +23438,12 @@ fi +@@ -21345,12 +23396,12 @@ fi $as_echo "$ol_cv_berkeley_db_version" >&6; } if test $ol_cv_berkeley_db_version = no ; then @@ -48948,7 +46902,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -21455,7 +23550,7 @@ fi +@@ -21457,7 +23508,7 @@ fi if test $ol_cv_berkeley_db = no ; then @@ -48957,7 +46911,7 @@ index a9c2177..db327e8 100755 fi -@@ -21487,7 +23582,7 @@ if test $ol_enable_wrappers != no ; then +@@ -21489,7 +23540,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" @@ -48966,7 +46920,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_TCPD_H 1 _ACEOF -@@ -21572,7 +23667,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h +@@ -21574,7 +23625,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h WRAP_LIBS="-lwrap" elif test $ol_enable_wrappers = yes ; then @@ -48975,7 +46929,7 @@ index a9c2177..db327e8 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;} -@@ -21582,13 +23677,12 @@ fi +@@ -21584,13 +23635,12 @@ fi if test $ol_enable_syslog != no ; then ac_fn_c_check_func "$LINENO" "openlog" "ac_cv_func_openlog" @@ -48991,7 +46945,7 @@ index a9c2177..db327e8 100755 fi ol_enable_syslog=$ac_cv_func_openlog fi -@@ -21599,15 +23693,14 @@ if test $ol_enable_sql != no ; then +@@ -21601,15 +23651,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" @@ -49009,7 +46963,7 @@ index a9c2177..db327e8 100755 fi -@@ -21627,7 +23720,7 @@ done +@@ -21629,7 +23678,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; } @@ -49018,7 +46972,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -21661,7 +23754,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -21663,7 +23712,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; } @@ -49027,7 +46981,7 @@ index a9c2177..db327e8 100755 have_iodbc=yes else have_iodbc=no -@@ -21675,7 +23768,7 @@ fi +@@ -21677,7 +23726,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; } @@ -49036,7 +46990,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -21709,7 +23802,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -21711,7 +23760,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; } @@ -49045,7 +46999,7 @@ index a9c2177..db327e8 100755 have_odbc=yes else have_odbc=no -@@ -21723,7 +23816,7 @@ fi +@@ -21725,7 +23774,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; } @@ -49054,7 +47008,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -21757,7 +23850,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -21759,7 +23808,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; } @@ -49063,7 +47017,7 @@ index a9c2177..db327e8 100755 have_odbc32=yes else have_odbc32=no -@@ -21802,7 +23895,7 @@ $as_echo "$have_odbc32" >&6; } +@@ -21804,7 +23853,7 @@ $as_echo "$have_odbc32" >&6; } ;; *) @@ -49072,7 +47026,7 @@ index a9c2177..db327e8 100755 ;; esac fi -@@ -21814,7 +23907,7 @@ $as_echo "$have_odbc32" >&6; } +@@ -21816,7 +23865,7 @@ $as_echo "$have_odbc32" >&6; } SLAPD_SQL_LIBS="$ol_link_sql" elif test $ol_enable_sql != auto ; then @@ -49081,7 +47035,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -21824,7 +23917,7 @@ if test $ol_enable_ndb != no ; then +@@ -21826,7 +23875,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; } @@ -49090,16 +47044,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test -n "$MYSQL"; then -@@ -21836,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 -@@ -21858,7 +23951,7 @@ fi +@@ -21860,7 +23909,7 @@ fi if test "$MYSQL" != yes ; then @@ -49108,7 +47053,7 @@ index a9c2177..db327e8 100755 fi SQL_INC=`mysql_config --include` -@@ -21876,10 +23969,10 @@ if ac_fn_c_try_cpp "$LINENO"; then : +@@ -21878,10 +23927,10 @@ if ac_fn_c_try_cpp "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@ -49121,7 +47066,7 @@ index a9c2177..db327e8 100755 CPPFLAGS="$save_CPPFLAGS" SQL_LIB=`mysql_config --libs_r` -@@ -21890,7 +23983,7 @@ rm -f conftest.err conftest.$ac_ext +@@ -21892,7 +23941,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; } @@ -49130,7 +47075,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -21924,11 +24017,11 @@ LIBS=$ac_check_lib_save_LIBS +@@ -21926,11 +23975,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; } @@ -49144,7 +47089,7 @@ index a9c2177..db327e8 100755 fi -@@ -21945,8 +24038,7 @@ for ac_header in unicode/utypes.h +@@ -21947,8 +23996,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" @@ -49154,7 +47099,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -21960,7 +24052,7 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then +@@ -21962,7 +24010,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; } @@ -49163,7 +47108,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -22016,8 +24108,7 @@ if test $ol_with_cyrus_sasl != no ; then +@@ -22018,8 +24066,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" @@ -49173,7 +47118,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -22031,7 +24122,7 @@ done +@@ -22033,7 +24080,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; } @@ -49182,7 +47127,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -22065,12 +24156,12 @@ LIBS=$ac_check_lib_save_LIBS +@@ -22067,12 +24114,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; } @@ -49197,7 +47142,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -22104,7 +24195,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -22106,7 +24153,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; } @@ -49206,7 +47151,7 @@ index a9c2177..db327e8 100755 ol_link_sasl="-lsasl" fi -@@ -22114,7 +24205,7 @@ fi +@@ -22116,7 +24163,7 @@ fi if test $ol_link_sasl = no ; then if test $ol_with_cyrus_sasl != auto ; then @@ -49215,7 +47160,7 @@ index a9c2177..db327e8 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;} -@@ -22128,7 +24219,7 @@ $as_echo "$as_me: WARNING: Strong authentication not supported!" >&2;} +@@ -22130,7 +24177,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; } @@ -49224,7 +47169,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -22164,7 +24255,7 @@ $as_echo "$ol_cv_sasl_compat" >&6; } +@@ -22166,7 +24213,7 @@ $as_echo "$ol_cv_sasl_compat" >&6; } if test $ol_cv_sasl_compat = no ; then ol_link_sasl=no @@ -49233,7 +47178,7 @@ index a9c2177..db327e8 100755 fi -@@ -22178,7 +24269,7 @@ $as_echo "#define HAVE_CYRUS_SASL 1" >>confdefs.h +@@ -22180,7 +24227,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" @@ -49242,7 +47187,7 @@ index a9c2177..db327e8 100755 $as_echo "#define HAVE_SASL_VERSION 1" >>confdefs.h -@@ -22227,7 +24318,7 @@ if test $ol_with_fetch != no ; then +@@ -22229,7 +24276,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; } @@ -49251,7 +47196,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -22271,7 +24362,7 @@ fi +@@ -22273,7 +24320,7 @@ fi ol_link_fetch=freebsd elif test $ol_with_fetch != auto ; then @@ -49260,7 +47205,7 @@ index a9c2177..db327e8 100755 fi fi -@@ -22280,14 +24371,14 @@ if test $ol_enable_crypt != no ; then +@@ -22282,14 +24329,14 @@ if test $ol_enable_crypt != no ; then LIBS="$TLS_LIBS $LIBS" ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" @@ -49277,7 +47222,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -22321,7 +24412,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -22323,7 +24370,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; } @@ -49286,7 +47231,7 @@ index a9c2177..db327e8 100755 LUTIL_LIBS="$LUTIL_LIBS -lcrypt" have_crypt=yes else -@@ -22341,7 +24432,7 @@ $as_echo "#define HAVE_CRYPT 1" >>confdefs.h +@@ -22343,7 +24390,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 @@ -49295,7 +47240,7 @@ index a9c2177..db327e8 100755 fi { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling crypt support" >&5 -@@ -22352,13 +24443,13 @@ fi +@@ -22354,13 +24401,13 @@ fi if test $ol_enable_proctitle != no ; then ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" @@ -49311,7 +47256,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -22392,7 +24483,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -22394,7 +24441,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; } @@ -49320,7 +47265,7 @@ index a9c2177..db327e8 100755 have_setproctitle=yes LUTIL_LIBS="$LUTIL_LIBS -lutil" else -@@ -22421,8 +24512,7 @@ if test $ol_enable_slp != no ; then +@@ -22423,8 +24470,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" @@ -49330,7 +47275,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -22435,7 +24525,7 @@ done +@@ -22437,7 +24483,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; } @@ -49339,7 +47284,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -22469,7 +24559,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -22471,7 +24517,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; } @@ -49348,7 +47293,7 @@ index a9c2177..db327e8 100755 have_slp=yes else have_slp=no -@@ -22483,13 +24573,13 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h +@@ -22485,13 +24531,13 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h fi elif test $ol_enable_slp = yes ; then @@ -49364,7 +47309,7 @@ index a9c2177..db327e8 100755 else -@@ -22500,7 +24590,7 @@ _ACEOF +@@ -22502,7 +24548,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" @@ -49373,7 +47318,7 @@ index a9c2177..db327e8 100755 else -@@ -22511,7 +24601,7 @@ _ACEOF +@@ -22513,7 +24559,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" @@ -49382,7 +47327,7 @@ index a9c2177..db327e8 100755 else -@@ -22522,7 +24612,7 @@ _ACEOF +@@ -22524,7 +24570,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" @@ -49391,7 +47336,7 @@ index a9c2177..db327e8 100755 else -@@ -22533,7 +24623,7 @@ _ACEOF +@@ -22535,7 +24581,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "caddr_t" "ac_cv_type_caddr_t" "$ac_includes_default" @@ -49400,7 +47345,7 @@ index a9c2177..db327e8 100755 else -@@ -22544,7 +24634,7 @@ _ACEOF +@@ -22546,7 +24592,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" @@ -49409,7 +47354,7 @@ index a9c2177..db327e8 100755 else -@@ -22556,7 +24646,7 @@ fi +@@ -22558,7 +24604,7 @@ fi ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" @@ -49418,7 +47363,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LONG_LONG 1 -@@ -22566,7 +24656,7 @@ _ACEOF +@@ -22568,7 +24614,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" @@ -49427,7 +47372,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 -@@ -22582,14 +24672,14 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_de +@@ -22584,14 +24630,14 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_de #include #endif " @@ -49444,7 +47389,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -22641,7 +24731,7 @@ fi +@@ -22643,7 +24689,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; } @@ -49453,7 +47398,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22677,7 +24767,7 @@ ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_inclu +@@ -22679,7 +24725,7 @@ ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_inclu #include " @@ -49462,7 +47407,7 @@ index a9c2177..db327e8 100755 else -@@ -22690,7 +24780,7 @@ fi +@@ -22692,7 +24738,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; } @@ -49471,7 +47416,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22721,7 +24811,7 @@ fi +@@ -22723,7 +24769,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; } @@ -49480,7 +47425,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22756,7 +24846,7 @@ fi +@@ -22758,7 +24804,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; } @@ -49489,7 +47434,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22790,7 +24880,7 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h +@@ -22792,7 +24838,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" @@ -49498,7 +47443,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -@@ -22802,7 +24892,7 @@ fi +@@ -22804,7 +24850,7 @@ fi ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" "$ac_includes_default #include " @@ -49507,7 +47452,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_PASSWD_PW_GECOS 1 -@@ -22814,7 +24904,7 @@ fi +@@ -22816,7 +24862,7 @@ fi ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_passwd_pw_passwd" "$ac_includes_default #include " @@ -49516,7 +47461,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_PASSWD_PW_PASSWD 1 -@@ -22826,7 +24916,7 @@ fi +@@ -22828,7 +24874,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if toupper() requires islower()" >&5 $as_echo_n "checking if toupper() requires islower()... " >&6; } @@ -49525,7 +47470,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else -@@ -22865,7 +24955,7 @@ fi +@@ -22867,7 +24913,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; } @@ -49534,48 +47479,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22874,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; -@@ -22895,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; -@@ -22912,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; -@@ -22945,7 +25036,7 @@ fi +@@ -22947,7 +24993,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler understands volatile" >&5 $as_echo_n "checking if compiler understands volatile... " >&6; } @@ -49584,7 +47488,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22988,7 +25079,7 @@ $as_echo "#define CROSS_COMPILING 1" >>confdefs.h +@@ -22990,7 +25036,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; } @@ -49593,7 +47497,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown -@@ -23206,7 +25297,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +@@ -23208,7 +25254,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -49602,7 +47506,7 @@ index a9c2177..db327e8 100755 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -@@ -23218,7 +25309,7 @@ fi +@@ -23220,7 +25266,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; } @@ -49611,7 +47515,7 @@ index a9c2177..db327e8 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 : -@@ -23227,9 +25318,8 @@ else +@@ -23229,9 +25275,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;} @@ -49623,7 +47527,7 @@ index a9c2177..db327e8 100755 else ac_cv_sizeof_short=0 fi -@@ -23252,7 +25342,7 @@ _ACEOF +@@ -23254,7 +25299,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; } @@ -49632,7 +47536,7 @@ index a9c2177..db327e8 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 : -@@ -23261,9 +25351,8 @@ else +@@ -23263,9 +25308,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;} @@ -49644,7 +47548,7 @@ index a9c2177..db327e8 100755 else ac_cv_sizeof_int=0 fi -@@ -23286,7 +25375,7 @@ _ACEOF +@@ -23288,7 +25332,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; } @@ -49653,7 +47557,7 @@ index a9c2177..db327e8 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 : -@@ -23295,9 +25384,8 @@ else +@@ -23297,9 +25341,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;} @@ -49665,7 +47569,7 @@ index a9c2177..db327e8 100755 else ac_cv_sizeof_long=0 fi -@@ -23320,7 +25408,7 @@ _ACEOF +@@ -23322,7 +25365,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; } @@ -49674,7 +47578,7 @@ index a9c2177..db327e8 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 : -@@ -23329,9 +25417,8 @@ else +@@ -23331,9 +25374,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;} @@ -49686,7 +47590,7 @@ index a9c2177..db327e8 100755 else ac_cv_sizeof_long_long=0 fi -@@ -23354,7 +25441,7 @@ _ACEOF +@@ -23356,7 +25398,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; } @@ -49695,7 +47599,7 @@ index a9c2177..db327e8 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 : -@@ -23363,9 +25450,8 @@ else +@@ -23365,9 +25407,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;} @@ -49707,7 +47611,7 @@ index a9c2177..db327e8 100755 else ac_cv_sizeof_wchar_t=0 fi -@@ -23413,7 +25499,7 @@ if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then +@@ -23415,7 +25456,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 @@ -49716,7 +47620,7 @@ index a9c2177..db327e8 100755 fi fi if test $ol_with_mp = long || test $ol_with_mp = auto ; then -@@ -23423,14 +25509,14 @@ 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 $as_echo "#define USE_MP_LONG 1" >>confdefs.h elif test $ol_with_mp = long ; then @@ -49733,7 +47637,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_BN_H 1 _ACEOF -@@ -23442,7 +25528,7 @@ done +@@ -23444,7 +25485,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" @@ -49742,7 +47646,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_CRYPTO_H 1 _ACEOF -@@ -23459,14 +25545,14 @@ done +@@ -23461,14 +25502,14 @@ done $as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h elif test $ol_with_mp = bignum ; then @@ -49759,7 +47663,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_GMP_H 1 _ACEOF -@@ -23477,7 +25563,7 @@ done +@@ -23479,7 +25520,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; } @@ -49768,7 +47672,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -23511,7 +25597,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -23513,7 +25554,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; } @@ -49777,7 +47681,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LIBGMP 1 _ACEOF -@@ -23526,7 +25612,7 @@ $as_echo "#define USE_MP_GMP 1" >>confdefs.h +@@ -23528,7 +25569,7 @@ $as_echo "#define USE_MP_GMP 1" >>confdefs.h ol_with_mp=gmp elif test $ol_with_mp = gmp ; then @@ -49786,7 +47690,7 @@ index a9c2177..db327e8 100755 fi fi if test $ol_with_mp = auto ; then -@@ -23535,7 +25621,7 @@ fi +@@ -23537,7 +25578,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } @@ -49795,7 +47699,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -23605,7 +25691,7 @@ fi +@@ -23607,7 +25648,7 @@ fi for ac_func in strftime do : ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" @@ -49804,7 +47708,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRFTIME 1 _ACEOF -@@ -23614,7 +25700,7 @@ else +@@ -23616,7 +25657,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; } @@ -49813,7 +47717,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -23648,7 +25734,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -23650,7 +25691,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; } @@ -49822,7 +47726,7 @@ index a9c2177..db327e8 100755 $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h LIBS="-lintl $LIBS" -@@ -23660,7 +25746,7 @@ done +@@ -23662,7 +25703,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton()" >&5 $as_echo_n "checking for inet_aton()... " >&6; } @@ -49831,7 +47735,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -23707,7 +25793,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h +@@ -23709,7 +25750,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h ac_fn_c_check_func "$LINENO" "_spawnlp" "ac_cv_func__spawnlp" @@ -49840,7 +47744,7 @@ index a9c2177..db327e8 100755 $as_echo "#define HAVE_SPAWNLP 1" >>confdefs.h -@@ -23715,7 +25801,7 @@ fi +@@ -23717,7 +25758,7 @@ fi ac_fn_c_check_func "$LINENO" "_snprintf" "ac_cv_func__snprintf" @@ -49849,7 +47753,7 @@ index a9c2177..db327e8 100755 ac_cv_func_snprintf=yes $as_echo "#define snprintf _snprintf" >>confdefs.h -@@ -23728,8 +25814,7 @@ for ac_func in vsnprintf _vsnprintf +@@ -23730,8 +25771,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" @@ -49859,7 +47763,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -23748,13 +25833,13 @@ fi +@@ -23750,13 +25790,13 @@ fi for ac_func in vprintf do : ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" @@ -49875,7 +47779,7 @@ index a9c2177..db327e8 100755 $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -@@ -23770,8 +25855,7 @@ if test $ac_cv_func_vprintf = yes ; then +@@ -23772,8 +25812,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" @@ -49885,7 +47789,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -23842,8 +25926,7 @@ for ac_func in \ +@@ -23844,8 +25883,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" @@ -49895,7 +47799,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -23852,25 +25935,31 @@ fi +@@ -23854,25 +25892,31 @@ fi done @@ -49939,7 +47843,7 @@ index a9c2177..db327e8 100755 -@@ -23883,8 +25972,7 @@ if test "$ac_cv_func_getpeereid" != yes; then +@@ -23885,8 +25929,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" @@ -49949,7 +47853,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -23898,7 +25986,7 @@ done +@@ -23900,7 +25943,7 @@ done #include #endif " @@ -49958,7 +47862,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN 1 -@@ -23913,7 +26001,7 @@ fi +@@ -23915,7 +25958,7 @@ fi #include #endif " @@ -49967,7 +47871,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 -@@ -23924,7 +26012,7 @@ fi +@@ -23926,7 +25969,7 @@ fi fi ac_fn_c_check_member "$LINENO" "struct stat" "st_fstype" "ac_cv_member_struct_stat_st_fstype" "$ac_includes_default" @@ -49976,7 +47880,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_FSTYPE 1 -@@ -23933,7 +26021,7 @@ _ACEOF +@@ -23935,7 +25978,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_vfstype" "ac_cv_member_struct_stat_st_vfstype" "$ac_includes_default" @@ -49985,7 +47889,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_VFSTYPE 1 -@@ -23981,7 +26069,7 @@ if test "$ol_enable_slapi" != no ; then +@@ -23983,7 +26026,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" @@ -49994,7 +47898,7 @@ index a9c2177..db327e8 100755 cat >>confdefs.h <<_ACEOF #define HAVE_LTDL_H 1 _ACEOF -@@ -23992,11 +26080,11 @@ done +@@ -23994,11 +26037,11 @@ done if test $ac_cv_header_ltdl_h != yes ; then @@ -50008,7 +47912,7 @@ index a9c2177..db327e8 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -24030,7 +26118,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -24032,7 +26075,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; } @@ -50017,7 +47921,7 @@ index a9c2177..db327e8 100755 SLAPI_LIBS=-lltdl LIBSLAPI=slapi/libslapi.la -@@ -24039,7 +26127,7 @@ $as_echo "#define HAVE_LIBLTDL 1" >>confdefs.h +@@ -24041,7 +26084,7 @@ $as_echo "#define HAVE_LIBLTDL 1" >>confdefs.h else @@ -50026,7 +47930,7 @@ index a9c2177..db327e8 100755 fi -@@ -24111,7 +26199,7 @@ $as_echo "$as_me: WARNING: ACIs need dynacl" >&2;} +@@ -24113,7 +26156,7 @@ $as_echo "$as_me: WARNING: ACIs need dynacl" >&2;} fi if test "$ol_enable_aci" = mod ; then MFLAG=SLAPD_MOD_DYNAMIC @@ -50035,7 +47939,7 @@ index a9c2177..db327e8 100755 else MFLAG=SLAPD_MOD_STATIC fi -@@ -24840,390 +26928,1616 @@ fi +@@ -24842,390 +26885,1664 @@ fi @@ -50079,14 +47983,6 @@ index a9c2177..db327e8 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='#' @@ -50406,16 +48302,16 @@ index a9c2177..db327e8 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 -pR'. ++ # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' ++ as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else -+ as_ln_s='cp -pR' ++ as_ln_s='cp -p' + fi +else -+ as_ln_s='cp -pR' ++ as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null @@ -50475,16 +48371,28 @@ index a9c2177..db327e8 100755 + as_mkdir_p=false +fi + -+ -+# 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 ++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 + +# 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'" @@ -50506,7 +48414,7 @@ index a9c2177..db327e8 100755 +# values after options handling. +ac_log=" +This file was extended by $as_me, which was -+generated by GNU Autoconf 2.69. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS @@ -50572,10 +48480,10 @@ index a9c2177..db327e8 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.69, ++configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + -+Copyright (C) 2012 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + @@ -50666,7 +48574,7 @@ index a9c2177..db327e8 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' @@ -50984,7 +48892,19 @@ index a9c2177..db327e8 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 @@ -51037,22 +48957,10 @@ index a9c2177..db327e8 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" ;; --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' +-LTLIBOBJS=$ac_ltlibobjs + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac - done --LIBOBJS=$ac_libobjs -- --LTLIBOBJS=$ac_ltlibobjs ++done -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -51184,7 +49092,25 @@ index a9c2177..db327e8 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' -- else ++ ++{ ++ 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 - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; @@ -51197,11 +49123,12 @@ index a9c2177..db327e8 100755 - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' -- fi ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + 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=: @@ -51210,35 +49137,9 @@ index a9c2177..db327e8 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 @@ -51292,17 +49193,12 @@ index a9c2177..db327e8 100755 + for (key in S) S_is_set[key] = 1 + FS = "" --# 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 +-# 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" +} +{ + line = $ 0 @@ -51321,6 +49217,20 @@ index a9c2177..db327e8 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' @@ -51332,8 +49242,16 @@ index a9c2177..db327e8 100755 - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi -+ print line -+} ++_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 -# 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" @@ -51346,22 +49264,6 @@ index a9c2177..db327e8 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 @@ -51385,11 +49287,16 @@ index a9c2177..db327e8 100755 +}' +fi --# CDPATH. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +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'. @@ -51398,6 +49305,10 @@ index a9c2177..db327e8 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 @@ -51409,14 +49320,6 @@ index a9c2177..db327e8 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='%!_!# ' @@ -51428,7 +49331,11 @@ index a9c2177..db327e8 100755 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi + fi +- $as_echo "$as_me: error: $1" >&2 +- as_fn_exit $as_status +-} # as_fn_error +- +done -# as_fn_set_status STATUS @@ -51622,12 +49529,7 @@ index a9c2177..db327e8 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. */ @@ -51647,19 +49549,24 @@ index a9c2177..db327e8 100755 + *) ac_sed_conf_input=$configure_input;; + esac --as_me=`$as_basename -- "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ +-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 '/^.*\/\([^/][^/]*\)\/*$/{ + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ @@ -51715,11 +49622,27 @@ index a9c2177..db327e8 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 @@ -51739,62 +49662,17 @@ index a9c2177..db327e8 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 -- 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 + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; @@ -51894,11 +49772,17 @@ index a9c2177..db327e8 100755 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi -+ else + else +- as_ln_s='cp -p' + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 -+ fi + 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 +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 @@ -51934,13 +49818,20 @@ index a9c2177..db327e8 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 @@ -51949,14 +49840,28 @@ index a9c2177..db327e8 100755 + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; -+ 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" | + 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. @@ -51969,39 +49874,6 @@ index a9c2177..db327e8 100755 + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -25241,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'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`$as_dirname -- "$file" || -+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q @@ -52019,6 +49891,41 @@ index a9c2177..db327e8 100755 + q + } + s/.*/./; q'` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # 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 ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || ++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$file" : 'X\(//\)[^/]' \| \ ++ 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 + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" @@ -53528,7 +51435,7 @@ index a9c2177..db327e8 100755 ;; "default":C) chmod +x tests/run -@@ -26319,7 +29361,7 @@ _ACEOF +@@ -26321,7 +29324,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || @@ -53537,7 +51444,7 @@ index a9c2177..db327e8 100755 # configure is writing to config.log, and then calls config.status. -@@ -26340,7 +29382,7 @@ if test "$no_create" != yes; then +@@ -26342,7 +29345,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. @@ -53651,5 +51558,5 @@ index 8c42a51..69816b4 100644 /* Define to the type of arg 3 for `accept'. */ #undef ber_socklen_t -- -1.7.11.4 +1.7.11.7 diff --git a/openldap-constraint-count.patch b/openldap-constraint-count.patch deleted file mode 100644 index 8329c00..0000000 --- a/openldap-constraint-count.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fix count constraint when using multiple modifications - -Constraint overlay doesn't take into account multiple modifications when using -count. - -Example: If count for 'description' attribute is set e.g. to 2, the following -results in a constraint violation: - -dn: cn=usr2, dc=my-domain,dc=com -add: description -description: d1 -description: d2 -description: d3-viol - -However, this passes: - -dn: cn=usr2, dc=my-domain,dc=com -add: description -description: d1 -- -add: description -description: d2 -- -add: description -description: d3 - -This patch fixes the behavior in case multiple modifications are used. - -Author: Jan Synacek -Upstream ITS: #7168 -Upstream commit: bb8112c382c24db25b175459e340ce248fe25563 -Resolves: #742163 - ---- - servers/slapd/overlays/constraint.c | 117 ++++++++++++++++++++++++----------- - 1 file changed, 80 insertions(+), 37 deletions(-) - -diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c -index e6a9267..538d383 100644 ---- a/servers/slapd/overlays/constraint.c -+++ b/servers/slapd/overlays/constraint.c -@@ -838,6 +838,68 @@ add_violation: - - - static int -+constraint_check_count_violation( Modifications *m, Entry *target_entry, constraint *cp ) -+{ -+ BerVarray b = NULL; -+ unsigned ce = 0; -+ unsigned ca; -+ int j; -+ -+ for ( j = 0; cp->ap[j]; j++ ) { -+ ca = 0; -+ -+ /* Get this attribute count */ -+ if ( target_entry ) -+ ce = constraint_count_attr( target_entry, cp->ap[j] ); -+ -+ for( ; m; m = m->sml_next ) { -+ if ( cp->ap[j] == m->sml_desc ) { -+ switch ( m->sml_op ) { -+ case LDAP_MOD_DELETE: -+ if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL ) { -+ ce = 0; -+ } -+ else { -+ /* No need to check for values' validity. Invalid values -+ * cause the whole transaction to die anyway. */ -+ for ( ca = 0; b[ca].bv_val; ++ca ); -+ ce -= ca; -+ } -+ break; -+ -+ case LDAP_MOD_ADD: -+ if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL ) -+ continue; -+ -+ for ( ca = 0; b[ca].bv_val; ++ca ); -+ ce += ca; -+ break; -+ -+ case LDAP_MOD_REPLACE: -+ if (( b = m->sml_values ) == NULL || b[0].bv_val == NULL ) -+ continue; -+ -+ for ( ca = 0; b[ca].bv_val; ++ca ); -+ ce = ca; -+ break; -+ -+ default: -+ /* impossible! assert? */ -+ return 1; -+ } -+ -+ Debug(LDAP_DEBUG_TRACE, -+ "==> constraint_check_count_violation ce = %u, " -+ "ca = %u, cp->count = %lu\n", -+ ce, ca, (unsigned long) cp->count); -+ } -+ } -+ } -+ -+ return ( ce > cp->count ); -+} -+ -+static int - constraint_update( Operation *op, SlapReply *rs ) - { - slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; -@@ -850,6 +912,8 @@ constraint_update( Operation *op, SlapReply *rs ) - struct berval rsv = BER_BVC("modify breaks constraint"); - int rc; - char *msg = NULL; -+ int is_v; -+ int first = 1; - - if (get_relax(op)) { - return SLAP_CB_CONTINUE; -@@ -880,10 +944,12 @@ constraint_update( Operation *op, SlapReply *rs ) - /* Do we need to count attributes? */ - for(cp = c; cp; cp = cp->ap_next) { - if (cp->count != 0 || cp->set || cp->restrict_lud != 0) { -- op->o_bd = on->on_info->oi_origdb; -- rc = be_entry_get_rw( op, &op->o_req_ndn, NULL, NULL, 0, &target_entry ); -- op->o_bd = be; -- -+ if (first) { -+ op->o_bd = on->on_info->oi_origdb; -+ rc = be_entry_get_rw( op, &op->o_req_ndn, NULL, NULL, 0, &target_entry ); -+ op->o_bd = be; -+ first = 0; -+ } - if (rc != 0 || target_entry == NULL) { - Debug(LDAP_DEBUG_TRACE, - "==> constraint_update rc = %d DN=\"%s\"%s\n", -@@ -893,7 +959,16 @@ constraint_update( Operation *op, SlapReply *rs ) - rc = LDAP_CONSTRAINT_VIOLATION; - goto mod_violation; - } -- break; -+ -+ is_v = constraint_check_count_violation(m, target_entry, cp); -+ -+ Debug(LDAP_DEBUG_TRACE, -+ "==> constraint_update is_v: %d\n", is_v, 0, 0); -+ -+ if (is_v) { -+ rc = LDAP_CONSTRAINT_VIOLATION; -+ goto mod_violation; -+ } - } - } - -@@ -912,10 +987,6 @@ constraint_update( Operation *op, SlapReply *rs ) - if ((( b = m->sml_values ) == NULL ) || (b[0].bv_val == NULL)) - continue; - -- /* Get this attribute count, if needed */ -- if (target_entry) -- ce = constraint_count_attr(target_entry, m->sml_desc); -- - for(cp = c; cp; cp = cp->ap_next) { - int j; - for (j = 0; cp->ap[j]; j++) { -@@ -929,34 +1000,6 @@ constraint_update( Operation *op, SlapReply *rs ) - continue; - } - -- if (cp->count != 0) { -- unsigned ca; -- -- if (m->sml_op == LDAP_MOD_DELETE) -- ce = 0; -- -- for (ca = 0; b[ca].bv_val; ++ca); -- -- Debug(LDAP_DEBUG_TRACE, -- "==> constraint_update ce = %u, " -- "ca = %u, cp->count = %lu\n", -- ce, ca, (unsigned long) cp->count); -- -- if (m->sml_op == LDAP_MOD_ADD) { -- if (ca + ce > cp->count) { -- rc = LDAP_CONSTRAINT_VIOLATION; -- goto mod_violation; -- } -- } -- if (m->sml_op == LDAP_MOD_REPLACE) { -- if (ca > cp->count) { -- rc = LDAP_CONSTRAINT_VIOLATION; -- goto mod_violation; -- } -- ce = ca; -- } -- } -- - /* DELETE are to be ignored beyond this point */ - if (( m->sml_op & LDAP_MOD_OP ) == LDAP_MOD_DELETE) - continue; --- -1.7.10.4 - diff --git a/openldap-nss-certs-from-certdb-fallback-pem.patch b/openldap-nss-certs-from-certdb-fallback-pem.patch index dad03c7..6a81d94 100644 --- a/openldap-nss-certs-from-certdb-fallback-pem.patch +++ b/openldap-nss-certs-from-certdb-fallback-pem.patch @@ -1,27 +1,34 @@ MozNSS: load certificates from certdb, fallback to PEM -If TLS_CACERT pointed to a PEM file and TLS_CACERTDIR was set to NSS certificate database, the backend assumed that -the certificate is always located in the certificate database. This assumption might be wrong. This patch makes the -library to try to load the certificate from NSS database and fallback to PEM file if unsuccessfull. +If TLS_CACERT pointed to a PEM file and TLS_CACERTDIR was set to NSS +certificate database, the backend assumed that the certificate is always +located in the certificate database. This assumption might be wrong. + +This patch makes the library to try to load the certificate from NSS +database and fallback to PEM file if unsuccessfull. Author: Jan Vcelak Upstream ITS: #7389 Resolves: #857455 +--- + libraries/libldap/tls_m.c | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 7ebcd24..634f9d9 100644 +index 61d71d4..49a3f8f 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) +@@ -1412,7 +1412,7 @@ tlsm_ctx_load_private_key( tlsm_ctx *ctx ) /* prefer unlocked key, then key from opened certdb, then any other */ - if (unlocked_key) + if ( unlocked_key ) ctx->tc_private_key = unlocked_key; -- else if (ctx->tc_certdb_slot) +- else if ( ctx->tc_certdb_slot ) + else if ( ctx->tc_certdb_slot && !ctx->tc_using_pem ) - ctx->tc_private_key = PK11_FindKeyByDERCert(ctx->tc_certdb_slot, ctx->tc_certificate, pin_arg); + 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); -@@ -1906,8 +1906,6 @@ tlsm_deferred_init( void *arg ) + ctx->tc_private_key = PK11_FindKeyByAnyCert( ctx->tc_certificate, pin_arg ); +@@ -1900,8 +1900,6 @@ tlsm_deferred_init( void *arg ) } return -1; } @@ -30,7 +37,7 @@ index 7ebcd24..634f9d9 100644 } NSS_SetDomesticPolicy(); -@@ -2360,15 +2358,9 @@ tlsm_deferred_ctx_init( void *arg ) +@@ -2354,15 +2352,9 @@ tlsm_deferred_ctx_init( void *arg ) /* set up our cert and key, if any */ if ( lt->lt_certfile ) { @@ -48,8 +55,8 @@ index 7ebcd24..634f9d9 100644 + if ( ctx->tc_certdb ) { char *tmp_certname; - if (tlsm_is_tokenname_certnick(lt->lt_certfile)) { -@@ -2388,9 +2380,24 @@ tlsm_deferred_ctx_init( void *arg ) + if ( tlsm_is_tokenname_certnick( lt->lt_certfile )) { +@@ -2382,9 +2374,24 @@ 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 ) ); @@ -76,5 +83,5 @@ index 7ebcd24..634f9d9 100644 if ( lt->lt_keyfile ) { -- -1.7.11.4 +1.7.11.7 diff --git a/openldap-nss-ignore-certdb-sql-prefix.patch b/openldap-nss-ignore-certdb-sql-prefix.patch deleted file mode 100644 index ff9c33c..0000000 --- a/openldap-nss-ignore-certdb-sql-prefix.patch +++ /dev/null @@ -1,31 +0,0 @@ -MozNSS: ignore certdb 'sql:' prefix when testing existence of the directory - -If the certdb uses newer SQL format, the certificate directory name starts with 'sql:'. This prefix has to be ignored -when testing certificate directory existence. - -Author: Jan Vcelak -Upstream ITS: #7388 -Resolves: #857373 - -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 61d71d4..80fa4f1 100644 ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -1643,7 +1643,13 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix ) - return; - } - -- prc = PR_GetFileInfo( certdir, &prfi ); -+ /* ignore sql: prefix if provided */ -+ if ( strncmp( "sql:", certdir, 4 ) == 0 ) { -+ prc = PR_GetFileInfo( certdir + 4, &prfi ); -+ } else { -+ prc = PR_GetFileInfo( certdir, &prfi ); -+ } -+ - /* if certdir exists (file or directory) then it cannot specify a prefix */ - if ( prc == PR_SUCCESS ) { - return; --- -1.7.11.4 - diff --git a/openldap-nss-ignore-certdb-type-prefix.patch b/openldap-nss-ignore-certdb-type-prefix.patch new file mode 100644 index 0000000..2fab916 --- /dev/null +++ b/openldap-nss-ignore-certdb-type-prefix.patch @@ -0,0 +1,47 @@ +MozNSS: ignore certdb database type prefix when checking existence of the directory + +If the certdb is specified including the database type prefix (e.g. +sql:, dbm:), the prefix has to be ignored when checking the +certificate directory existence. + +Author: Jan Vcelak +Upstream ITS: #7388 +Resolves: #857373 + +--- + libraries/libldap/tls_m.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c +index 49a3f8f..5ee21a2 100644 +--- a/libraries/libldap/tls_m.c ++++ b/libraries/libldap/tls_m.c +@@ -1633,6 +1633,7 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix ) + { + char sep = PR_GetDirectorySeparator(); + char *ptr = NULL; ++ char *chkpath = NULL; + struct PRFileInfo prfi; + PRStatus prc; + +@@ -1643,8 +1644,16 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix ) + return; + } + +- prc = PR_GetFileInfo( certdir, &prfi ); ++ /* ignore database type prefix (e.g. sql:, dbm:) if provided */ ++ chkpath = strchr( certdir, ':' ); ++ if ( chkpath != NULL ) { ++ chkpath += 1; ++ } else { ++ chkpath = certdir; ++ } ++ + /* if certdir exists (file or directory) then it cannot specify a prefix */ ++ prc = PR_GetFileInfo( chkpath, &prfi ); + if ( prc == PR_SUCCESS ) { + return; + } +-- +1.7.11.7 + diff --git a/openldap-nss-prefer-unlocked-key.patch b/openldap-nss-prefer-unlocked-key.patch deleted file mode 100644 index 89f0701..0000000 --- a/openldap-nss-prefer-unlocked-key.patch +++ /dev/null @@ -1,81 +0,0 @@ -MozNSS: prefer authenticated slot when getting private key - -Author: Jan Vcelak -Upstream ITS: #7359 - -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index f37da06..5022efb 100644 ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -901,7 +901,7 @@ tlsm_get_pin(PK11SlotInfo *slot, PRBool retry, tlsm_ctx *ctx) - * capability the server would have to be started in foreground mode - * if using an encrypted key. - */ -- if ( ctx->tc_pin_file ) { -+ if ( ctx && ctx->tc_pin_file ) { - pwdstr = tlsm_get_pin_from_file( token_name, ctx ); - if (retry && pwdstr != NULL) - return NULL; -@@ -990,6 +990,38 @@ tlsm_cert_is_self_issued( CERTCertificate *cert ) - return is_self_issued; - } - -+/* -+ * The private key for used certificate can be already unlocked by other -+ * thread or library. Find the unlocked key if possible. -+ */ -+static SECKEYPrivateKey * -+tlsm_find_unlocked_key(tlsm_ctx *ctx, void *pin_arg) -+{ -+ SECKEYPrivateKey *result = NULL; -+ -+ PK11SlotList *slots = PK11_GetAllSlotsForCert(ctx->tc_certificate, NULL); -+ if (!slots) { -+ PRErrorCode errcode = PR_GetError(); -+ Debug(LDAP_DEBUG_ANY, -+ "TLS: cannot get all slots for certificate '%s' (error %d: %s)", -+ tlsm_ctx_subject_name(ctx), errcode, -+ PR_ErrorToString(errcode, PR_LANGUAGE_I_DEFAULT)); -+ return result; -+ } -+ -+ PK11SlotListElement *le; -+ for (le = slots->head; le && !result; le = le->next) { -+ PK11SlotInfo *slot = le->slot; -+ if (!PK11_IsLoggedIn(slot, NULL)) -+ continue; -+ -+ result = PK11_FindKeyByDERCert(slot, ctx->tc_certificate, pin_arg); -+ } -+ -+ PK11_FreeSlotList(slots); -+ return result; -+} -+ - static SECStatus - tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg, - PRBool checksig, SECCertificateUsage certUsage, PRBool warn_only, -@@ -1303,7 +1335,19 @@ tlsm_ctx_load_private_key(tlsm_ctx *ctx) - - void *pin_arg = SSL_RevealPinArg(ctx->tc_model); - -- ctx->tc_private_key = PK11_FindKeyByAnyCert(ctx->tc_certificate, pin_arg); -+ SECKEYPrivateKey *unlocked_key = tlsm_find_unlocked_key(ctx, pin_arg); -+ Debug(LDAP_DEBUG_ANY, -+ "TLS: %s unlocked certificate for certificate '%s'.\n", -+ unlocked_key ? "found" : "no", tlsm_ctx_subject_name(ctx), 0); -+ -+ /* prefer unlocked key, then key from opened certdb, then any other */ -+ if (unlocked_key) -+ ctx->tc_private_key = unlocked_key; -+ else if (ctx->tc_certdb_slot) -+ 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); -+ - if (!ctx->tc_private_key) { - PRErrorCode errcode = PR_GetError(); - Debug(LDAP_DEBUG_ANY, --- -1.7.11.4 - diff --git a/openldap.spec b/openldap.spec index 3acba70..39c6126 100644 --- a/openldap.spec +++ b/openldap.spec @@ -7,8 +7,8 @@ %global systemctl_bin /usr/bin/systemctl Name: openldap -Version: 2.4.32 -Release: 3%{?dist} +Version: 2.4.33 +Release: 1%{?dist} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP @@ -37,26 +37,22 @@ Patch5: openldap-ldaprc-currentdir.patch Patch6: openldap-userconfig-setgid.patch Patch7: openldap-dns-priority.patch Patch8: openldap-syncrepl-unset-tls-options.patch -Patch9: openldap-constraint-count.patch -Patch10: openldap-man-sasl-nocanon.patch -Patch11: openldap-ai-addrconfig.patch -Patch12: openldap-nss-prefer-unlocked-key.patch -Patch13: openldap-nss-allow-certname-with-token-name.patch -Patch14: openldap-nss-update-list-of-ciphers.patch -Patch15: openldap-tls-no-reuse-of-tls_session.patch -Patch16: openldap-nss-regex-search-hashed-cacert-dir.patch -Patch17: openldap-nss-ignore-certdb-sql-prefix.patch -Patch18: openldap-nss-certs-from-certdb-fallback-pem.patch +Patch9: openldap-man-sasl-nocanon.patch +Patch10: openldap-ai-addrconfig.patch +Patch11: openldap-nss-update-list-of-ciphers.patch +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 # Fedora specific patches Patch100: openldap-autoconf-pkgconfig-nss.patch -Patch101: openldap-fedora-systemd.patch -Patch102: openldap-workaround-m4-858274.patch +Patch101: openldap-autoreconf.patch +Patch102: openldap-fedora-systemd.patch # patches for the evolution library (see README.evolution) Patch200: openldap-evolution-ntlm.patch -BuildRequires: autoconf BuildRequires: cyrus-sasl-devel, nss-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl # smbk5pwd overlay: @@ -143,9 +139,7 @@ pushd openldap-%{version} # use pkg-config for Mozilla NSS library %patch100 -p1 -# workaround for m4 bug #858274 -#AUTOMAKE=/bin/true autoreconf --install --force -%patch102 -p1 +%patch101 -p1 # alternative include paths for Mozilla NSS ln -s %{_includedir}/nss3 include/nss @@ -167,11 +161,8 @@ ln -s %{_includedir}/nspr4 include/nspr %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch101 -p1 +%patch102 -p1 # build smbk5pwd with other overlays ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays @@ -627,6 +618,13 @@ exit 0 %{evolution_connector_prefix}/ %changelog +* Thu Oct 11 2012 Jan Vcelak 2.4.33-1 +- new upstream release: + + slapd: ACLs, syncrepl + + backends: locking and memory management in MDB + + manpages: slapo-refint +- patch update: MozNSS certificate database in SQL format cannot be used (#860317) + * Fri Sep 14 2012 Jan Vcelak 2.4.32-3 - fix: some TLS ciphers cannot be enabled (#852338) - fix: connection hangs after fallback to second server when certificate hostname verification fails (#852476) diff --git a/sources b/sources index 77e6d92..987e7cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a3e85cf61860ca5e8a1eba6753dd9d0 openldap-2.4.32.tgz +5adae44897647c15ce5abbff313bc85a openldap-2.4.33.tgz