Page MenuHomePhabricator (Chris)
Files F127986

No OneTemporary
Actions

Authored By
Unknown
Size
1 MB
Referenced Files
None
Subscribers
None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/mongodb-1.1.5/RELEASE-1.1.5 b/mongodb-1.1.5/RELEASE-1.1.5
deleted file mode 100644
index 1c455196..00000000
--- a/mongodb-1.1.5/RELEASE-1.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-RELEASE 1.1.5
--------------
-2016-03-18 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-632: Define MONGOC_NO_AUTOMATIC_GLOBALS when bundling libmongoc
-
-2016-03-10 Jeremy Mikola <jmikola@gmail.com>
- * Back to -dev
-
-2016-03-10 Jeremy Mikola <jmikola@gmail.com>
- * Add 1.1.4 release notes
-
-
diff --git a/mongodb-1.1.5/src/libbson/VERSION_CURRENT b/mongodb-1.1.5/src/libbson/VERSION_CURRENT
deleted file mode 100644
index 785cda80..00000000
--- a/mongodb-1.1.5/src/libbson/VERSION_CURRENT
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libbson/VERSION_RELEASED b/mongodb-1.1.5/src/libbson/VERSION_RELEASED
deleted file mode 100644
index 785cda80..00000000
--- a/mongodb-1.1.5/src/libbson/VERSION_RELEASED
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/libtool.m4 b/mongodb-1.1.5/src/libbson/build/autotools/m4/libtool.m4
deleted file mode 100644
index d7c043f4..00000000
--- a/mongodb-1.1.5/src/libbson/build/autotools/m4/libtool.m4
+++ /dev/null
@@ -1,7997 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# 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
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- _LT_PATH_MAGIC
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# 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
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME. Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
- [m4_ifval([$1], [$1], [$2])])
- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
- m4_ifval([$4],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
- lt_dict_add_subkey([lt_decl_dict], [$2],
- [tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
- [0], [m4_fatal([$0: too few arguments: $#])],
- [1], [m4_fatal([$0: too few arguments: $#: $1])],
- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
- [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_if([$2], [],
- m4_quote(lt_decl_varnames),
- m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-# # Some comment about what VAR is for.
-# visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
- [description])))[]dnl
-m4_pushdef([_libtool_name],
- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
- [0], [_libtool_name=[$]$1],
- [1], [_libtool_name=$lt_[]$1],
- [2], [_libtool_name=$lt_[]$1],
- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
- dnl If the libtool generation code has been placed in $CONFIG_LT,
- dnl instead of duplicating it all over again into config.status,
- dnl then we will have config.status run $CONFIG_LT later, so it
- dnl needs to know what name is stored there:
- [AC_CONFIG_COMMANDS([libtool],
- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
- dnl If the libtool generation code is destined for config.status,
- dnl expand the accumulated commands and init code now:
- [AC_CONFIG_COMMANDS([libtool],
- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
- AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
- case $[1] in
- --version | --v* | -V )
- echo "$lt_cl_version"; exit 0 ;;
- --help | --h* | -h )
- echo "$lt_cl_help"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --quiet | --q* | --silent | --s* | -q )
- lt_cl_silent=: ;;
-
- -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
- *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
- esac
- shift
-done
-
-if $lt_cl_silent; then
- exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure. Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars. Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
- m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-
- cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- case $host_os in
- aix3*)
- cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-_LT_EOF
- ;;
- esac
-
- _LT_PROG_LTMAIN
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- _LT_PROG_REPLACE_SHELLFNS
-
- mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
- [C], [_LT_LANG(C)],
- [C++], [_LT_LANG(CXX)],
- [Go], [_LT_LANG(GO)],
- [Java], [_LT_LANG(GCJ)],
- [Fortran 77], [_LT_LANG(F77)],
- [Fortran], [_LT_LANG(FC)],
- [Windows Resource], [_LT_LANG(RC)],
- [m4_ifdef([_LT_LANG_]$1[_CONFIG],
- [_LT_LANG($1)],
- [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
- [LT_SUPPORTED_TAG([$1])dnl
- m4_append([_LT_TAGS], [$1 ])dnl
- m4_define([_LT_LANG_]$1[_enabled], [])dnl
- _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_GO. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC], [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
- if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
- fi
-fi
-if test -z "$GOC"; then
- AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [LT_LANG(CXX)],
- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
- [LT_LANG(F77)],
- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
- [LT_LANG(FC)],
- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
- [LT_LANG(GCJ)],
- [m4_ifdef([AC_PROG_GCJ],
- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([A][M_PROG_GCJ],
- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([LT_PROG_GCJ],
- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
- [LT_LANG(GO)],
- [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
- [LT_LANG(RC)],
- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
- AC_CHECK_TOOL([LIPO], [lipo], [:])
- AC_CHECK_TOOL([OTOOL], [otool], [:])
- AC_CHECK_TOOL([OTOOL64], [otool64], [:])
- _LT_DECL([], [DSYMUTIL], [1],
- [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
- _LT_DECL([], [NMEDIT], [1],
- [Tool to change global to local symbols on Mac OS X])
- _LT_DECL([], [LIPO], [1],
- [Tool to manipulate fat objects and archives on Mac OS X])
- _LT_DECL([], [OTOOL], [1],
- [ldd/readelf like tool for Mach-O binaries on Mac OS X])
- _LT_DECL([], [OTOOL64], [1],
- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- rm -rf libconftest.dylib*
- echo "int foo(void){return 1;}" > conftest.c
- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
- # If there is a non-empty error log, and "single_module"
- # appears in it, assume the flag caused a linker warning
- if test -s conftest.err && $GREP single_module conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- # Otherwise, if the output was created with a 0 exit code from
- # the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
- lt_cv_apple_cc_single_mod=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -rf libconftest.dylib*
- rm -f conftest.*
- fi])
-
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
-
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
- [lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -s conftest.err && $GREP force_load conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- ])
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
- m4_require([_LT_REQUIRED_DARWIN_CHECKS])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
- [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-],[])
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- lt_aix_libpath_sed='[
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }]'
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi],[])
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
- fi
- ])
- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-
-case "$ECHO" in
- printf*) AC_MSG_RESULT([printf]) ;;
- print*) AC_MSG_RESULT([print -r]) ;;
- *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT([${with_sysroot}])
- AC_MSG_ERROR([The sysroot must be an absolute path.])
- ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AS_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *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 AC_TRY_EVAL(ac_compile); 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
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
- ;;
- powerpc64-*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*|s390*-*tpf*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*)
- case $host in
- i?86-*-solaris*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- sparc*-*-solaris*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
- fi
- ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- [echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- ])
- ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
- [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
- [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
- [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
- [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$5], , :, [$5])
-else
- m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- else
- $2=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$4], , :, [$4])
-else
- m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- os2*)
- # The test takes a long time on OS/2.
- lt_cv_sys_max_cmd_len=8192
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
- [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}]
-_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
- [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
- [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
- [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
- [Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING([if we can lock with hard links])
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
- [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
- test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
- [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
- [], [
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix[[4-9]]*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[[01]] | aix4.[[01]].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi[[45]]*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$cc_basename in
- yes,*)
- # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- 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'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
- ;;
- esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
- ;;
- esac
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- 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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-
- # Some binutils ld are patched to set DT_RUNPATH
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
- [lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [lt_cv_shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- ])
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-*nto* | *qnx*)
- version_type=qnx
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-uts4*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-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
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
- [Variables whose values should be saved in libtool wrapper scripts and
- restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
- [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
- [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
- [[List of archive names. First name is the real one, the rest are links.
- The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
- [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
- [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
- [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
- [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
- [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
- [[As "finish_cmds", except a single script fragment to be evaled but
- not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
- [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
- [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="m4_if([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
- [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- 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
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# '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
-aix[[4-9]]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[[45]]*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-cegcc*)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- fi
- ;;
- esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
- [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
- [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # 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"
- done
- : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
- AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
- [lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
- cat conftest.out >&AS_MESSAGE_LOG_FD
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
- fi
- rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- [lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-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
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
-
- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
- [Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris*)
- symcode='[[BDRT]]'
- ;;
-sco3.2v5*)
- symcode='[[DT]]'
- ;;
-sysv4.2uw2*)
- symcode='[[DT]]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[[ABDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK ['"\
-" {last_section=section; section=\$ 3};"\
-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-" ' prfx=^$ac_symprfx]"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
- if 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
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
- cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols. */
-LT@&t@_DLSYM_CONST struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
- cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_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*
-
- # 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
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
- [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
- [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_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)=
-
-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'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix[[4-9]]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- chorus*)
- case $cc_basename in
- cxch68*)
- # Green Hills C++ Compiler
- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- dgux*)
- case $cc_basename in
- ec++*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
- aCC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- ;;
- *)
- ;;
- esac
- ;;
- interix*)
- # This is c89, which is MS Visual C++ (no shared libs)
- # Anyone wants to do a port?
- ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
- ;;
- *)
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- icpc* )
- # Intel C++, used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- cxx*)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
- # IBM XL 8.0, 9.0 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- esac
- ;;
- esac
- ;;
- lynxos*)
- ;;
- m88k*)
- ;;
- mvs*)
- case $cc_basename in
- cxx*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
- netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC*)
- # Rational C++ 2.4.1
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx*)
- # Digital/Compaq C++
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- psos*)
- ;;
- solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
- *)
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- lcc*)
- # Lucid
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- *)
- ;;
- esac
- ;;
- vxworks*)
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
-
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
- fi
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- ;;
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- ccc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
- ;;
- *Sun\ F* | *Sun*Fortran*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- *Sun\ C*)
- # Sun C 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
- *Intel*\ [[CF]]*Compiler*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- *Portland\ Group*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
- esac
- ;;
-
- newsos6)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- rdos*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- solaris*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- unicos*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-
- uts4*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *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_CACHE_CHECK([for $compiler option to produce PIC],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
- [Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
- [Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- case $host_os in
- aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw* | cegcc*)
- case $cc_basename in
- cl*)
- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-], [
- runpath_var=
- _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_cmds, $1)=
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(compiler_needs_object, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(hardcode_automatic, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(old_archive_from_new_cmds, $1)=
- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
- esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
- then
- tmp_addflag=' $pic_flag'
- tmp_sharedflag='-shared'
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- lf95*) # Lahey Fortran 8.1
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- tmp_sharedflag='--shared' ;;
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- ;;
- esac
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- 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~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-
- case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- ;;
- *)
- # For security reasons, it is highly recommended that you always
- # use absolute paths for naming shared libraries, and exclude the
- # DT_RUNPATH tag from executables and libraries. But doing so
- # requires that you compile everything twice, which is a pain.
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- 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
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" &&
- strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- bsdi[[45]]*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # 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
- ;;
-
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2.*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- 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'
- ;;
-
- 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
- ;;
-
- 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'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- [lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE(
- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- [C++], [[int foo (void) { return 0; }]],
- [Fortran 77], [[
- subroutine foo
- end]],
- [Fortran], [[
- subroutine foo
- end]])])],
- [lt_cv_irix_exported_symbol=yes],
- [lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *nto* | *qnx*)
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_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'
-
- # Both c and cxx compiler support -rpath directly
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- solaris*)
- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
- ;;
- *)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- ;;
- esac
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
- # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- fi
- ;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
- _LT_TAGVAR(hardcode_direct, $1)=no
- ;;
- motorola)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- 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
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
- ;;
- esac
- fi
- fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
- [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
- [$RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- ])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
- ;;
- esac
- fi
- ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
- [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
- [enable_shared_with_static_runtimes], [0],
- [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
- [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
- [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
- [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
- [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
- [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
- [Commands used to build a loadable module if different from building
- a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
- [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
- [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
- [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
- [Flag to hardcode $libdir into a binary during linking.
- This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
- [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
- library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
- [Set to "yes" if building a shared library automatically hardcodes DIR
- into the library and all subsequent libraries and executables linked
- against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
- [Set to yes if linker adds runtime paths of dependent libraries
- to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
- [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
- [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
- [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
- [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
- [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
- [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
- [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
- [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
- LT_SYS_DLOPEN_SELF
- _LT_CMD_STRIPLIB
-
- # Report which library types will actually be built
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- 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_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_CFLAGS=$CFLAGS
- lt_save_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- lt_save_with_gnu_ld=$with_gnu_ld
- lt_save_path_LD=$lt_cv_path_LD
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
- $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
- $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- CFLAGS=$CXXFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- # We don't want -fno-exception when compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- else
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- fi
-
- if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- LT_PATH_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" |
- $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- GXX=no
- with_gnu_ld=no
- wlarc=
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- _LT_TAGVAR(ld_shlibs, $1)=yes
- case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
- aix_use_runtimelinking=yes
- break
- ;;
- esac
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" &&
- strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
- # export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # 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
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # g++
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- freebsd2.*)
- # C++ shared libraries reported to be fairly broken before
- # switch to ELF
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- freebsd-elf*)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- case $host_cpu in
- hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case $host_cpu in
- hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
- # SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
- fi
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
- esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc* | ecpc* )
- # Intel C++
- with_gnu_ld=yes
- # version 8.0 and above of icpc choke on multiply defined symbols
- # if we add $predep_objects and $postdep_objects, however 7.1 and
- # earlier do not add the objects themselves.
- case `$CC -V 2>&1` in
- *"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
- case $host_cpu in
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- esac
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- case `$CC -V` in
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
- *) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
- ;;
- xl* | mpixl* | bgxl*)
- # IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
-
- # Not sure whether something based on
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- # would be better.
- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- esac
- ;;
- esac
- ;;
-
- lynxos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- mvs*)
- case $cc_basename in
- cxx*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
-
- *nto* | *qnx*)
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
- output_verbose_link_cmd=func_echo_all
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- case $host in
- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
- esac
- ;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx*)
- case $host in
- osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- ;;
- *)
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- case $host in
- osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- psos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc*)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
-
- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
- *)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_TAGVAR(archive_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'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- fi
- ;;
- esac
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
-
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- with_gnu_ld=$lt_save_with_gnu_ld
- lt_cv_path_LDCXX=$lt_cv_path_LD
- lt_cv_path_LD=$lt_save_path_LD
- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer a
- a=0
- return
- end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
- prev=$p
- continue
- fi
-
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
- -L | -R)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
- else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
- fi
- ;;
- # The "-l" case would never come before the object being
- # linked, so don't bother handling this case.
- esac
- else
- if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
- else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- prev=
- ;;
-
- *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
- pre_test_object_deps_done=yes
- continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
- else
- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
- fi
- else
- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
- else
- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
- fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_TAGVAR(predep_objects,$1)=
- _LT_TAGVAR(postdep_objects,$1)=
- _LT_TAGVAR(postdeps,$1)=
- ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
- [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
- [Dependencies to place before and after the objects being linked to
- create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
- [The library search path used internally by the compiler when linking
- a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${F77-"f77"}
- CFLAGS=$FFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- GCC=$G77
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # 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
- ;;
- 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)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
- compiler=$CC
- GCC=$ac_cv_fc_compiler_gnu
-
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- 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
-
-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
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# 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=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
- :
- _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
- [AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
- [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltoptions.m4 b/mongodb-1.1.5/src/libbson/build/autotools/m4/ltoptions.m4
deleted file mode 100644
index 5d9acd8e..00000000
--- a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltoptions.m4
+++ /dev/null
@@ -1,384 +0,0 @@
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
- _LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
- [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME. If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
- dnl
- dnl Simply set some default values (i.e off) if boolean options were not
- dnl specified:
- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
- ])
- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
- ])
- dnl
- dnl If no reference was made to various pairs of opposing options, then
- dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
- dnl archives by default:
- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
- ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS], [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
- _LT_DECL([build_libtool_libs], [enable_shared], [0],
- [Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
- _LT_DECL([build_old_libs], [enable_static], [0],
- [Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- 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],
- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
- [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
- [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
- [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
- [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
- [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
- [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltsugar.m4 b/mongodb-1.1.5/src/libbson/build/autotools/m4/ltsugar.m4
deleted file mode 100644
index 9000a057..00000000
--- a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
- [$#], [2], [[$2]],
- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
- [$#], 1, [],
- [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
- [m4_foreach([_Lt_suffix],
- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
- [lt_append([$1], [$2], [$3])$4],
- [$5])],
- [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
- [$5],
- [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
- [lt_join(m4_quote(m4_default([$4], [[, ]])),
- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltversion.m4 b/mongodb-1.1.5/src/libbson/build/autotools/m4/ltversion.m4
deleted file mode 100644
index 07a8602d..00000000
--- a/mongodb-1.1.5/src/libbson/build/autotools/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers -*- Autoconf -*-
-#
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/lt~obsolete.m4 b/mongodb-1.1.5/src/libbson/build/autotools/m4/lt~obsolete.m4
deleted file mode 100644
index c573da90..00000000
--- a/mongodb-1.1.5/src/libbson/build/autotools/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else. This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/mongodb-1.1.5/src/libmongoc/VERSION_CURRENT b/mongodb-1.1.5/src/libmongoc/VERSION_CURRENT
deleted file mode 100644
index 785cda80..00000000
--- a/mongodb-1.1.5/src/libmongoc/VERSION_CURRENT
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libmongoc/VERSION_RELEASED b/mongodb-1.1.5/src/libmongoc/VERSION_RELEASED
deleted file mode 100644
index 785cda80..00000000
--- a/mongodb-1.1.5/src/libmongoc/VERSION_RELEASED
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/libtool.m4 b/mongodb-1.1.5/src/libmongoc/build/autotools/m4/libtool.m4
deleted file mode 100644
index d7c043f4..00000000
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/libtool.m4
+++ /dev/null
@@ -1,7997 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# 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
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- _LT_PATH_MAGIC
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# 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
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME. Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
- [m4_ifval([$1], [$1], [$2])])
- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
- m4_ifval([$4],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
- lt_dict_add_subkey([lt_decl_dict], [$2],
- [tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
- [0], [m4_fatal([$0: too few arguments: $#])],
- [1], [m4_fatal([$0: too few arguments: $#: $1])],
- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
- [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_if([$2], [],
- m4_quote(lt_decl_varnames),
- m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-# # Some comment about what VAR is for.
-# visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
- [description])))[]dnl
-m4_pushdef([_libtool_name],
- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
- [0], [_libtool_name=[$]$1],
- [1], [_libtool_name=$lt_[]$1],
- [2], [_libtool_name=$lt_[]$1],
- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
- dnl If the libtool generation code has been placed in $CONFIG_LT,
- dnl instead of duplicating it all over again into config.status,
- dnl then we will have config.status run $CONFIG_LT later, so it
- dnl needs to know what name is stored there:
- [AC_CONFIG_COMMANDS([libtool],
- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
- dnl If the libtool generation code is destined for config.status,
- dnl expand the accumulated commands and init code now:
- [AC_CONFIG_COMMANDS([libtool],
- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
- AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
- case $[1] in
- --version | --v* | -V )
- echo "$lt_cl_version"; exit 0 ;;
- --help | --h* | -h )
- echo "$lt_cl_help"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --quiet | --q* | --silent | --s* | -q )
- lt_cl_silent=: ;;
-
- -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
- *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
- esac
- shift
-done
-
-if $lt_cl_silent; then
- exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure. Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars. Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
- m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-
- cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- case $host_os in
- aix3*)
- cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-_LT_EOF
- ;;
- esac
-
- _LT_PROG_LTMAIN
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- _LT_PROG_REPLACE_SHELLFNS
-
- mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
- [C], [_LT_LANG(C)],
- [C++], [_LT_LANG(CXX)],
- [Go], [_LT_LANG(GO)],
- [Java], [_LT_LANG(GCJ)],
- [Fortran 77], [_LT_LANG(F77)],
- [Fortran], [_LT_LANG(FC)],
- [Windows Resource], [_LT_LANG(RC)],
- [m4_ifdef([_LT_LANG_]$1[_CONFIG],
- [_LT_LANG($1)],
- [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
- [LT_SUPPORTED_TAG([$1])dnl
- m4_append([_LT_TAGS], [$1 ])dnl
- m4_define([_LT_LANG_]$1[_enabled], [])dnl
- _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_GO. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC], [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
- if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
- fi
-fi
-if test -z "$GOC"; then
- AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [LT_LANG(CXX)],
- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
- [LT_LANG(F77)],
- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
- [LT_LANG(FC)],
- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
- [LT_LANG(GCJ)],
- [m4_ifdef([AC_PROG_GCJ],
- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([A][M_PROG_GCJ],
- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([LT_PROG_GCJ],
- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
- [LT_LANG(GO)],
- [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
- [LT_LANG(RC)],
- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
- AC_CHECK_TOOL([LIPO], [lipo], [:])
- AC_CHECK_TOOL([OTOOL], [otool], [:])
- AC_CHECK_TOOL([OTOOL64], [otool64], [:])
- _LT_DECL([], [DSYMUTIL], [1],
- [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
- _LT_DECL([], [NMEDIT], [1],
- [Tool to change global to local symbols on Mac OS X])
- _LT_DECL([], [LIPO], [1],
- [Tool to manipulate fat objects and archives on Mac OS X])
- _LT_DECL([], [OTOOL], [1],
- [ldd/readelf like tool for Mach-O binaries on Mac OS X])
- _LT_DECL([], [OTOOL64], [1],
- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- rm -rf libconftest.dylib*
- echo "int foo(void){return 1;}" > conftest.c
- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
- # If there is a non-empty error log, and "single_module"
- # appears in it, assume the flag caused a linker warning
- if test -s conftest.err && $GREP single_module conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- # Otherwise, if the output was created with a 0 exit code from
- # the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
- lt_cv_apple_cc_single_mod=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -rf libconftest.dylib*
- rm -f conftest.*
- fi])
-
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
-
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
- [lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -s conftest.err && $GREP force_load conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- ])
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
- m4_require([_LT_REQUIRED_DARWIN_CHECKS])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
- [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-],[])
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- lt_aix_libpath_sed='[
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }]'
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi],[])
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
- fi
- ])
- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-
-case "$ECHO" in
- printf*) AC_MSG_RESULT([printf]) ;;
- print*) AC_MSG_RESULT([print -r]) ;;
- *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT([${with_sysroot}])
- AC_MSG_ERROR([The sysroot must be an absolute path.])
- ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AS_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *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 AC_TRY_EVAL(ac_compile); 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
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
- ;;
- powerpc64-*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*|s390*-*tpf*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*)
- case $host in
- i?86-*-solaris*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- sparc*-*-solaris*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
- fi
- ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- [echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- ])
- ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
- [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
- [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
- [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
- [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$5], , :, [$5])
-else
- m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- else
- $2=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$4], , :, [$4])
-else
- m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- os2*)
- # The test takes a long time on OS/2.
- lt_cv_sys_max_cmd_len=8192
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
- [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}]
-_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
- [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
- [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
- [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
- [Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING([if we can lock with hard links])
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
- [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
- test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
- [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
- [], [
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix[[4-9]]*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[[01]] | aix4.[[01]].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi[[45]]*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$cc_basename in
- yes,*)
- # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- 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'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
- ;;
- esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
- ;;
- esac
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- 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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-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
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-
- # Some binutils ld are patched to set DT_RUNPATH
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
- [lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [lt_cv_shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- ])
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-*nto* | *qnx*)
- version_type=qnx
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-uts4*)
- version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-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
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
- [Variables whose values should be saved in libtool wrapper scripts and
- restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
- [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
- [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
- [[List of archive names. First name is the real one, the rest are links.
- The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
- [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
- [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
- [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
- [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
- [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
- [[As "finish_cmds", except a single script fragment to be evaled but
- not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
- [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
- [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="m4_if([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
- [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- 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
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# '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
-aix[[4-9]]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[[45]]*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-cegcc*)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- fi
- ;;
- esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
- [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
- [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # 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"
- done
- : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
- AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
- [lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
- cat conftest.out >&AS_MESSAGE_LOG_FD
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
- fi
- rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- [lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-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
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
-
- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
- [Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris*)
- symcode='[[BDRT]]'
- ;;
-sco3.2v5*)
- symcode='[[DT]]'
- ;;
-sysv4.2uw2*)
- symcode='[[DT]]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[[ABDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK ['"\
-" {last_section=section; section=\$ 3};"\
-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-" ' prfx=^$ac_symprfx]"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
- if 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
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
- cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols. */
-LT@&t@_DLSYM_CONST struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
- cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_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*
-
- # 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
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
- [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
- [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_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)=
-
-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'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix[[4-9]]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- chorus*)
- case $cc_basename in
- cxch68*)
- # Green Hills C++ Compiler
- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- dgux*)
- case $cc_basename in
- ec++*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
- aCC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- ;;
- *)
- ;;
- esac
- ;;
- interix*)
- # This is c89, which is MS Visual C++ (no shared libs)
- # Anyone wants to do a port?
- ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
- ;;
- *)
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- icpc* )
- # Intel C++, used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- cxx*)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
- # IBM XL 8.0, 9.0 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- esac
- ;;
- esac
- ;;
- lynxos*)
- ;;
- m88k*)
- ;;
- mvs*)
- case $cc_basename in
- cxx*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
- netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC*)
- # Rational C++ 2.4.1
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx*)
- # Digital/Compaq C++
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- psos*)
- ;;
- solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
- *)
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- lcc*)
- # Lucid
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- case $cc_basename in
- CC*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- *)
- ;;
- esac
- ;;
- vxworks*)
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
-
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
- fi
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- ;;
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- ccc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
- ;;
- *Sun\ F* | *Sun*Fortran*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- *Sun\ C*)
- # Sun C 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
- *Intel*\ [[CF]]*Compiler*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- *Portland\ Group*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
- esac
- ;;
-
- newsos6)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- rdos*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- solaris*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- unicos*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-
- uts4*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *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_CACHE_CHECK([for $compiler option to produce PIC],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
- [Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
- [Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- case $host_os in
- aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw* | cegcc*)
- case $cc_basename in
- cl*)
- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-], [
- runpath_var=
- _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_cmds, $1)=
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(compiler_needs_object, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(hardcode_automatic, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(old_archive_from_new_cmds, $1)=
- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
- esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
- then
- tmp_addflag=' $pic_flag'
- tmp_sharedflag='-shared'
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- lf95*) # Lahey Fortran 8.1
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- tmp_sharedflag='--shared' ;;
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- ;;
- esac
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- 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~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-
- case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- ;;
- *)
- # For security reasons, it is highly recommended that you always
- # use absolute paths for naming shared libraries, and exclude the
- # DT_RUNPATH tag from executables and libraries. But doing so
- # requires that you compile everything twice, which is a pain.
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- 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
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" &&
- strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- bsdi[[45]]*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # 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
- ;;
-
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2.*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- 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'
- ;;
-
- 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
- ;;
-
- 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'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- [lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE(
- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- [C++], [[int foo (void) { return 0; }]],
- [Fortran 77], [[
- subroutine foo
- end]],
- [Fortran], [[
- subroutine foo
- end]])])],
- [lt_cv_irix_exported_symbol=yes],
- [lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *nto* | *qnx*)
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_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'
-
- # Both c and cxx compiler support -rpath directly
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- solaris*)
- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
- ;;
- *)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- ;;
- esac
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
- # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- fi
- ;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
- _LT_TAGVAR(hardcode_direct, $1)=no
- ;;
- motorola)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- 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
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
- ;;
- esac
- fi
- fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
- [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
- [$RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- ])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
- ;;
- esac
- fi
- ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
- [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
- [enable_shared_with_static_runtimes], [0],
- [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
- [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
- [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
- [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
- [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
- [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
- [Commands used to build a loadable module if different from building
- a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
- [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
- [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
- [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
- [Flag to hardcode $libdir into a binary during linking.
- This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
- [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
- library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
- [Set to "yes" if building a shared library automatically hardcodes DIR
- into the library and all subsequent libraries and executables linked
- against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
- [Set to yes if linker adds runtime paths of dependent libraries
- to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
- [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
- [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
- [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
- [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
- [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
- [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
- [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
- [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
- LT_SYS_DLOPEN_SELF
- _LT_CMD_STRIPLIB
-
- # Report which library types will actually be built
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- 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_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_CFLAGS=$CFLAGS
- lt_save_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- lt_save_with_gnu_ld=$with_gnu_ld
- lt_save_path_LD=$lt_cv_path_LD
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
- $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
- $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- CFLAGS=$CXXFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- # We don't want -fno-exception when compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- else
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- fi
-
- if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- LT_PATH_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" |
- $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- GXX=no
- with_gnu_ld=no
- wlarc=
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- _LT_TAGVAR(ld_shlibs, $1)=yes
- case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
- aix_use_runtimelinking=yes
- break
- ;;
- esac
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" &&
- strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
- # export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # 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
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # g++
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- freebsd2.*)
- # C++ shared libraries reported to be fairly broken before
- # switch to ELF
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- freebsd-elf*)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- case $host_cpu in
- hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case $host_cpu in
- hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
- # SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
- fi
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
- esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc* | ecpc* )
- # Intel C++
- with_gnu_ld=yes
- # version 8.0 and above of icpc choke on multiply defined symbols
- # if we add $predep_objects and $postdep_objects, however 7.1 and
- # earlier do not add the objects themselves.
- case `$CC -V 2>&1` in
- *"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
- case $host_cpu in
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- esac
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- case `$CC -V` in
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
- *) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
- ;;
- xl* | mpixl* | bgxl*)
- # IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
-
- # Not sure whether something based on
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- # would be better.
- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- esac
- ;;
- esac
- ;;
-
- lynxos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- mvs*)
- case $cc_basename in
- cxx*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
-
- *nto* | *qnx*)
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
- output_verbose_link_cmd=func_echo_all
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- case $host in
- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
- esac
- ;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx*)
- case $host in
- osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- ;;
- *)
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- case $host in
- osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- esac
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- psos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc*)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
-
- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
- *)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_TAGVAR(archive_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'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- fi
- ;;
- esac
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
-
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- with_gnu_ld=$lt_save_with_gnu_ld
- lt_cv_path_LDCXX=$lt_cv_path_LD
- lt_cv_path_LD=$lt_save_path_LD
- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer a
- a=0
- return
- end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
- prev=$p
- continue
- fi
-
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
- -L | -R)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
- else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
- fi
- ;;
- # The "-l" case would never come before the object being
- # linked, so don't bother handling this case.
- esac
- else
- if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
- else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- prev=
- ;;
-
- *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
- pre_test_object_deps_done=yes
- continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
- else
- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
- fi
- else
- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
- else
- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
- fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_TAGVAR(predep_objects,$1)=
- _LT_TAGVAR(postdep_objects,$1)=
- _LT_TAGVAR(postdeps,$1)=
- ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
- [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
- [Dependencies to place before and after the objects being linked to
- create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
- [The library search path used internally by the compiler when linking
- a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${F77-"f77"}
- CFLAGS=$FFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- GCC=$G77
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # 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
- ;;
- 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)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
- compiler=$CC
- GCC=$ac_cv_fc_compiler_gnu
-
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- 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
-
-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
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# 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=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
- :
- _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
- [AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
- [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltoptions.m4 b/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltoptions.m4
deleted file mode 100644
index 5d9acd8e..00000000
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltoptions.m4
+++ /dev/null
@@ -1,384 +0,0 @@
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
- _LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
- [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME. If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
- dnl
- dnl Simply set some default values (i.e off) if boolean options were not
- dnl specified:
- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
- ])
- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
- ])
- dnl
- dnl If no reference was made to various pairs of opposing options, then
- dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
- dnl archives by default:
- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
- ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS], [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
- _LT_DECL([build_libtool_libs], [enable_shared], [0],
- [Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
- _LT_DECL([build_old_libs], [enable_static], [0],
- [Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- 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],
- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
- [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
- [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
- [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
- [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
- [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
- [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltsugar.m4 b/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltsugar.m4
deleted file mode 100644
index 9000a057..00000000
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
- [$#], [2], [[$2]],
- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
- [$#], 1, [],
- [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
- [m4_foreach([_Lt_suffix],
- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
- [lt_append([$1], [$2], [$3])$4],
- [$5])],
- [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
- [$5],
- [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
- [lt_join(m4_quote(m4_default([$4], [[, ]])),
- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltversion.m4 b/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltversion.m4
deleted file mode 100644
index 07a8602d..00000000
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers -*- Autoconf -*-
-#
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/lt~obsolete.m4 b/mongodb-1.1.5/src/libmongoc/build/autotools/m4/lt~obsolete.m4
deleted file mode 100644
index c573da90..00000000
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else. This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/mongodb-1.1.5/ChangeLog b/mongodb-1.1.6/ChangeLog
similarity index 98%
rename from mongodb-1.1.5/ChangeLog
rename to mongodb-1.1.6/ChangeLog
index f04ef3a8..6f01c2d0 100644
--- a/mongodb-1.1.5/ChangeLog
+++ b/mongodb-1.1.6/ChangeLog
@@ -1,4457 +1,4505 @@
+2016-04-05 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #284
+
+2016-04-05 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-667: Fix check for existing "_id" field during BulkWrite::insert()
+
+2016-04-04 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #277
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * Consolidate shell variable assignments with AC_SUBST()
+
+2016-03-31 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #273
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-657: Support MONGOC_NO_AUTOMATIC GLOBALS configure flag
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-657: Upgrade libbson and libmongoc to 1.3.5
+
+2016-03-29 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #272
+
+2016-03-28 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
+
+2016-03-21 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #257
+
+2016-03-15 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-564: Use macros for accessing write result int32 fields
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-564, PHPC-626: WriteResult should use libmongoc's public API
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Fix title for PHPC-155 regression test
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Consolidate PHP 7 conditional in WriteResult debug handler
+
+2016-03-18 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2016-03-18 Jeremy Mikola <jmikola@gmail.com>
+ * Package 1.1.5
+
2016-03-18 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #266
2016-03-18 Jeremy Mikola <jmikola@gmail.com>
* PHPC-632: Define MONGOC_NO_AUTOMATIC_GLOBALS when bundling libmongoc
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.4 release notes
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.4
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #260
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-620: Lowercase hexadecimal strings in ObjectID ctor
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* Fix test title
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #259
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-623: Fix 64-bit integer conversion for BSON keys
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.3 release notes
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.3
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #252
2016-03-03 Jeremy Mikola <jmikola@gmail.com>
* Skip PHPC-545 test on HHVM due to __pclass encoding order
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #249
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* Improve comment in bson-toJSON_error-001.phpt
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-613: toJSON() should throw if bson_as_json() fails
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-615: Return after throwing for bson_reader_read() error
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #250
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-616: Document and array visitors should throw for corrupt BSON
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-531: Fix double free in corrupt BSON visitor
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* toPHP() regression tests for bson_reader_read() errors
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #248
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* Prevent duplication and reduce strlen() usage
2016-03-01 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-506: Use more descriptive messages in WriteExceptions
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #242
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-414: Combine 32-bit and 64-bit UTCDateTime debug handler tests
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #243
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-593: Binary type is an unsigned 8-bit integer
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-594: Timestamp components are unsigned 32-bit integers
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-595: Throw exception if wtimeout > INT32_MAX
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #241
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* Use INT32 limit constants instead of INT/LONG
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-544: Use phongo_long in UTCDateTime ctor
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-544: Consult SIZEOF_ZEND_LONG for 64-bit integer support
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* Remove unused macro, which is already defined in libbson
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-592: ADD_ASSOC_STRINGL() can only be used with string literals
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Revert "Merge pull request #241"
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #241
2016-02-24 Jeremy Mikola <jmikola@gmail.com>
* wip
2016-02-24 Jeremy Mikola <jmikola@gmail.com>
* Fix whitespace
2016-02-22 Jeremy Mikola <jmikola@gmail.com>
* Fix BulkWrite::update() "multi" option usage in docs
2016-02-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #226
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-545: Regression test for Peristable bug report
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-550: Always encode ODS field when serializing Persistable documents
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* Regression test for executing BulkWrite multiple times
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Fix test title
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Tests should use and cleanup their own collection
2016-02-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #231
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-581: Use ConnectionTimeoutException for server selection failures
2016-02-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #232
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-582: Manager::selectServer() should select exception class based on bson_error_t
2016-02-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #221
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Relax expected output patterns for HHVM
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Check for connection exceptions in exec and SS methods
2016-02-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Suppress warnings during stream creation
2016-02-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #233
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-566: Remove request_id from Manager::__debugInfo()
2016-02-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #234
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-567: Bump config.m4 library deps
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-567: Upgrade libbson and libmongoc to 1.3.3
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #230
2016-02-12 Derick Rethans <github@derickrethans.nl>
* Skip this test on HHVM, as its DateTime class is ancient and behaves differently
2016-02-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #227
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-523: Parse readconcernlevel in URI options array
2016-02-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #228
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-563: Remove undocumented Manager "hosts" URI option
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #218
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-539: Include read concern in Query debug output
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #225
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* Regression test for extending final classes
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-519: Add missing modifiers to final class methods
2016-02-08 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #223
2016-02-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-538: ObjectID should not abort on null ctor arg
2016-02-03 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #217
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-515: Test that negative cursor limits return one batch
2016-02-03 Derick Rethans <github@derickrethans.nl>
* Merged pull request #206
2016-01-20 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-543: MongoDB\BSON\UTCDateTime on 32 bit platforms parse argument wrong
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #216
2016-02-02 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-558: Upgrade libmongoc and libbson to 1.3.2
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* Remove Manager::executeInsert() usage in ODS docs
2016-01-12 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #202
2016-01-12 Derick Rethans <github@derickrethans.nl>
* Skip and fix test for HHVM with ReadConcerns
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.2 release notes
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.2
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #196
2016-01-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-496: Revert "Temporary workaround for warning in mongoc"
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #197
2016-01-06 Jeremy Mikola <jmikola@gmail.com>
* Improve other config.m4 check messages
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* Improve SASL check message
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* Don't print pcre-dir usage during configure check
2016-01-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #194
2016-01-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-529: Prefix BSON functions to avoid symbol conflicts
2016-01-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #192
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* phongo_bson_append() can be static and get zval type internally
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-528: Support zval references when appending BSON
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #191
2015-12-30 Remi Collet <fedora@famillecollet.com>
* PHPC-527: fix call to add_index_stringl
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #185
2015-12-26 Remi Collet <fedora@famillecollet.com>
* PHPC-527: Fix PHP 7 / 32bits build
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.1 release notes
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Encode special characters in commit messages for package.xml
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.1
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Allow for PHP 7.x support in package.xml
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #172
2015-12-16 Jeremy Mikola <jmikola@gmail.com>
* Fix protos for ReadPreference and WriteConcern
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #180
2015-12-22 Kanin Peanviriyakulkit <dogrocker@users.noreply.github.com>
* Remove "beta" in doc.
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #179
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: VC14 needs timezone defined for SSL function
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Fix syntax for empty struct initializer
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Merged pull request #175
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed test case, where PHP 5 and PHP 7 call the type differently
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed 'dump on uninitialised value' with BSON deserialisation
2015-12-16 Derick Rethans <github@derickrethans.nl>
* Fixed issues with PHP 7 and the new ReadConcern
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed CS from Joe's patch
2015-12-14 Joe Watkins <krakjoe@php.net>
* fix leaks and logical errors for PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-405: Additional zval* to zval changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-397: Additional RETURN_STRING updates
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Don't BSON-encode non-public properties in PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-374: zend_string updates for OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-404: Additional hash API changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-399: Additional zval_used_for_init cleanup
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Add the testcase from the report
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Segfault when using Manager through singleton class
2015-09-02 Hannes Magnusson <bjori@php.net>
* Use ZVAL_COPY_VALUE()
2015-09-01 Hannes Magnusson <bjori@php.net>
* Enable PHP7 on Travis
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-391 & PHPC-389: Stream and SSL API changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-387: Properly init the iterator, and don't free it on dtor
2015-09-01 Hannes Magnusson <bjori@php.net>
* _id doesn't have to be object
2015-09-01 Hannes Magnusson <bjori@php.net>
* Fix incorrect version checks
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-405: zval drop a level; zval*->zval, zval**->zval*
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-404: off-by-one hash api changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-390: php.ini updates
2015-08-31 Hannes Magnusson <bjori@php.net>
* littlebit to eager on the zend_string, this is PHP5
2015-08-31 Hannes Magnusson <bjori@php.net>
* Get the zend_string value
2015-08-31 Hannes Magnusson <bjori@php.net>
* hash API changes, off-by-ones
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: Use the compatability macros to get the object
2015-08-31 Hannes Magnusson <bjori@php.net>
* Properly initialize the zval* we are working with
2015-08-31 Hannes Magnusson <bjori@php.net>
* +1 in PHP5, not PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* Include numeric keys as well
2015-09-01 Patrick Boyd <pboyd04@gmail.com>
* Object property names missing due to lack of key length
2015-08-31 Hannes Magnusson <bjori@php.net>
* Should all compile now!
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simpilfy iterating over a zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* Use Z_ISUNDEF() to check the zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* WS
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-400: Handle IS_TRUE and IS_FALSE
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simplify IS_ARRAY/IS_OBJECT discovery for PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() and zval* -> zval upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* We already know the length
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* str_efree() not defined in PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_*() should RETURN ! :)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-399: zval_used_for_init is no longer needed (or defined)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-398: zend_parse_parameter 's' expects a char* and size_t now
2015-08-28 Patrick Boyd <pboyd04@gmail.com>
* PHP7 upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() is gone
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_STRING() duplicate argument removed
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-387: get_current_data() API changes
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: Use our bc type for free_object argument
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-396: HashTable no longer contains nApplyCount
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-394: Fix issue with WriteException and zend_read_property
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: PHP7 create/free object changes
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: create/free object handlers for PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* Define the TODOs for PHP5, these are PHP7 TODOs
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: Remove leftover braces
2015-08-27 Hannes Magnusson <bjori@php.net>
* Sprinkle TODOs -- it compiles now!
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-374: php_stream_xport_create() now wants zend_string
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-388 - dtor on bson_to_zval() failure
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-387: Iterator API changes
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: add_assoc_string_ex() doesn't have a duplicate param in PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-384: php_stream's no longer have resource ids
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-383: Simplify getting the current exception zval*
2015-08-26 Hannes Magnusson <bjori@php.net>
* PHPC-376: Cursor var_dump() is weird
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Remove MAKE_STD_ZVAL() usage
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-374: zend_string* vs char* PHP API changes (1/many)
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-372: zend_throw_exception() return value changes
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Start a phongo_compat.c with things that shouldn't be done in headers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Lets start with just php_phongo.c for now
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-371: Prep for PHP7 resource changes
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: Hardcode return_value_used to 1 in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: return_value_ptr and return_value_used removed in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Use the new Z_<CLASSNAME>_OBJ_P() macros
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-368: Refactor MongoDB\Driver\Manager ctor
2015-08-24 Hannes Magnusson <bjori@php.net>
* Fix const casting warning in php_array_api
2015-08-24 Hannes Magnusson <bjori@php.net>
* Resync with GitHub: https://github.com/sgolemon/php-array-api
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Include libbson and libmongoc version files in PECL package
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.0 release notes
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.0
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #168
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-509: Default Manager URI to "mongodb://localhost:27017/"
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #167
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Fix arginfo for ReadConcern constructor
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #163
2015-12-12 Jorgen Evens <jorgen@evens.eu>
* PHPC-514: Fix --with-mongodb-sasl flag
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #166
2015-12-14 Hannes Magnusson <bjori@php.net>
* PHPC-512: Disable async stream connections
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #165
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-508: Construct valid stream URI for IPv6 literals
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #158
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Manager::getReadConcern() and URI test
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Support readConcern option on Query
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Implement ReadConcern class
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Fix include for mongoc-write-concern-private.h
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #161
2015-12-11 Hannes Magnusson <bjori@php.net>
* Fix package license to be consistent with the source files
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #160
2015-12-11 Hannes Magnusson <bjori@php.net>
* Accept MongoDB 3.2 package repo public keys on test VM
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #157
2015-12-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-443: Support "bypassDocumentValidation" option in BulkWrite
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #156
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Update package repo public key for Travis CI builds
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Define STANDALONE as MongoDB 3.2 on Travis CI
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Bump libmongoc for CDRIVER-1046 memory leak fix
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: failReceivedGetmore does not support getMore commands
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Don't assert exact isMaster response when dumping Servers
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Split query tests for OP_QUERY and find command
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Add MongoDB 3.0 replica set test environment
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Profiled aggregate commands log the collection NS in 3.2
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Update open cursor check for MongoDB 3.2
2015-12-10 Derick Rethans <github@derickrethans.nl>
* Merge branch 'pr/152' — fixes PHPC-502 and issue #149
2015-12-10 Derick Rethans <github@derickrethans.nl>
* Use more descriptive unused value
2015-12-07 Hannes Magnusson <bjori@php.net>
* Fixed PHPC-502: bson_init_static(): precondition failed: data
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Use consistent name for MongoDB 3.0 test server
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #155
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Enable majority read concern by default in MO
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Use MongoDB 3.2 final for testing
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Make server startup via MO more robust
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Register STANDALONE-3.0 with the test suite
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* STANDALONE-3.0 port conflicted with STANDALONE-2.4
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Merged pull request #151
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Bump libmongoc and libbson to 1.3.0 releases
2015-12-02 Derick Rethans <github@derickrethans.nl>
* This code has changed in 3.2, and make the error message clear
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added 3.2.0rc5 to our Mongo Orchestration suite
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added some more phpt test leftovers to .gitignore
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Merge branch 'v1.0'
2015-12-08 Remi Collet <fedora@famillecollet.com>
* libmongoc 1.3 is not compatible
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Revise prep-release.php handling
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Merge branch 'v1.0'
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.1 release notes
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.1
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Revise prep-release.php handling
2015-12-07 Derick Rethans <github@derickrethans.nl>
* Merged pull request #150
2015-12-04 Hannes Magnusson <bjori@php.net>
* bump mongoc & libbson
2015-12-04 Hannes Magnusson <bjori@php.net>
* Generate the mongoc and libbson version files correctly
2015-12-04 Hannes Magnusson <bjori@php.net>
* Revert "Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed."
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #148
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Master branch is now 1.1.0-dev
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Add "-dev" to extension version constant
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #141
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Made error message more consistent as per Jeremy's comment
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Move flag exceptions back into config.m4
2015-12-02 Hannes Magnusson <bjori@php.net>
* Edgecase compiler warnings in mongoc are mongoc problem, not phongo
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Turn off missing braces to make Travis happy
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed.
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added weak symbols for Windows too
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Changed error message to make more sense.
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Upgrade libbson and libmongoc to latest master release
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Fixed memory leak as per Hannes' comment.
2015-11-20 Derick Rethans <github@derickrethans.nl>
* Only list a file once (crept in due to merge conflicts it seems)
2015-11-19 Hannes Magnusson <bjori@php.net>
* Temporary workaround for warning in mongoc
2015-11-19 Hannes Magnusson <bjori@php.net>
* PHPC-495: Upgrade bundled libbson and libmongoc to 1.3.0
2015-11-19 Hannes Magnusson <bjori@php.net>
* PHPC-488: Manager::selectServer() should throw when failing to select a server
2015-11-19 Hannes Magnusson <bjori@php.net>
* No need to double-initialize boptions
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Renamed struct members due to changes in libmongoc
2015-11-19 Derick Rethans <github@derickrethans.nl>
* mongoc_cursor_cursorid_init takes an extra bson_error
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Define weak symbols as per a comment in PHPC-406
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Add compilation of mongoc_read_concern.c
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Bump libbson and libmongoc to 1.3.0beta0
2015-11-17 Derick Rethans <github@derickrethans.nl>
* mongoc_topology_description_server_by_id now takes an additional bson_error_t (CDRIVER-906)
2015-11-17 Derick Rethans <github@derickrethans.nl>
* Ordered flag has moved into 'flags' struct (CDRIVER-893)
2015-11-17 Derick Rethans <github@derickrethans.nl>
* Initial upgrade to pre-1.3.0rc0 version.
2015-12-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #135
2015-11-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-487: Regression tests for check_closed stream handler
2015-11-06 Hannes Magnusson <bjori@php.net>
* PHPC-487: Reverse logic in check_closed stream handler
2015-11-25 Hannes Magnusson <bjori@php.net>
* Its a bit creepy seeing my family in bug reports
2015-11-25 Derick Rethans <github@derickrethans.nl>
* Merged pull request #143
2015-11-25 Derick Rethans <github@derickrethans.nl>
* PHPC-499: Only add the dependency when we're actually enabling the extension
2015-11-12 Derick Rethans <github@derickrethans.nl>
* Merged pull request #137
2015-11-12 Derick Rethans <github@derickrethans.nl>
* Wording tweaks after review
2015-11-12 Derick Rethans <github@derickrethans.nl>
* HHVM-136: Make hippo and phongo README/CONTRIBUTING files consistent
2015-11-02 Jeremy Mikola <jmikola@gmail.com>
* Update documentation for 1.0.0
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0 release notes
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #130
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-475: toJSON and fromJSON should thrown on error
2015-10-28 Jeremy Mikola <jmikola@gmail.com>
* Tests for fromJSON() and toJSON()
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0RC0 release notes
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0RC0
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Revise system libbson version check error message
2015-10-23 Jeremy Mikola <jmikola@gmail.com>
* Update GitHub URLs for org change and repo rename
2015-10-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #128
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-465: Remove WriteConcernException and WriteErrorException
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* Rename WriteConcernError tests
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-465: Remove Manager's single write methods
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-440: WriteErrorException extends abstract WriteException
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #127
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-462: Remove unused DuplicateKeyException
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #126
2015-10-19 Jeremy Mikola <jmikola@gmail.com>
* PHPC-310: Make BSON types final and disable serialization for now
2015-10-19 Jeremy Mikola <jmikola@gmail.com>
* Make BSON create_object assignments consistent
2015-10-16 Jeremy Mikola <jmikola@gmail.com>
* PHPC-310: Exception classes need not be final
2015-10-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #125
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-444: Support options array in BulkWrite and executeInsert()
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* Fix indentation
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #124
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-407: Rename X509 error test and fix cert path
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Rename X509 connection tests
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #123
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-454: Remove WriteResult::getInfo() method
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #122
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-441: slaveOk bit is now set on hinted secondary query
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules to 1.2.0
2015-10-12 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #121 from bjori/PHPC-256-prod-debug-logs
2015-10-07 Hannes Magnusson <bjori@php.net>
* PHPC-256: Productions debug logs
2015-10-07 Hannes Magnusson <bjori@php.net>
* PHPC-441: Skip (xfail) these tests while the ticket is being worked on
2015-10-07 Hannes Magnusson <bjori@php.net>
* Make sure we have the X509 declaration we need
2015-10-07 Hannes Magnusson <bjori@php.net>
* No need for TSRMLS here -- no calls to PHP at all
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Update install examples to mongodb-beta
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0beta2 release notes
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Avoid nested macros when reporting runtime version in debug mode
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Omit merge commits from release changelog
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Use UTC time when creating package.xml
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0beta2
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #120
2015-10-05 Remi Collet <fedora@famillecollet.com>
* PHPC-442: report PHP version in debug info
2015-10-05 Remi Collet <fedora@famillecollet.com>
* report runtime version in debug mode
2015-10-05 Remi Collet <fedora@famillecollet.com>
* rename macros
2015-10-04 Remi Collet <fedora@famillecollet.com>
* report libraries runtime versions
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #119
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Test write and WC error extraction for single write methods
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-409: $readPreference is no longer sent to non-mongos nodes
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* Update filenames for libmongoc and libbson version functions
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-438: Debug handler should display null for no WC error
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-436: Handle new writeConcernErrors array in mongoc_write_result_t
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules to 1.2.0-rc0
2015-09-11 Hannes Magnusson <bjori@php.net>
* PHPC-415: Add testcase
2015-09-11 Hannes Magnusson <bjori@php.net>
* PHPC-415: SSL/TLS already set-up for this stream
2015-09-09 Hannes Magnusson <bjori@php.net>
* $readPreferences should not be sent to standalone server
2015-09-09 Hannes Magnusson <bjori@php.net>
* Don't provide server_id when we have none
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #83
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Use versioned URI for mongo-orchestration
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Increase mongo-orchestration HTTP timeout
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Empty query results should still pass "find" phase in mo-tests
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Implement "clientHosts" phase for mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Support "delete" operation in mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Rename "findOne" to "find" in mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Fix exception throwing in mo-tests conversion script
2015-09-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #118
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Ignore non-public properties when encoding BSON
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* Previous break statement makes the else condition redundant
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #117
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-430, PHPC-377: Do not convert Query filter arg to an object
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-377: Eliminate object casting and whole lot of zend hash helpers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Get rid of MAKE_STD_ZVAL() and use bson_t instead
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-430: Regression tests for Query arg corruption
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #116
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHP versions in .travis.yml don't need to be strings
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-379: I broke PHP5.3 build. Thats OK, since we don't support it.
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #115
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-427: Fix parsing of null WC journal param for PHP 5.4
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-428: Remove support for WriteConcern fsync option
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Update arg info for WriteConcern $w ctor parameter
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #113
2015-09-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-427: Do not set WC journal/fsync to false for NULL args
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #110
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* Additional tests for WriteConcern debug handler
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* PHPC-423: WriteConcern should report default "w" option as null
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #109
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-426: WC ctor should throw for invalid $w and $wtimeout args
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-425: WC ctor should accept int/string $w args w/o casting
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* WriteConcern ctor error test doesn't need EXPECTF
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Use throws() helper function in WriteConcern ctor error test
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #106
2015-09-18 Derick Rethans <github@derickrethans.nl>
* Skip logging tests for HHVM, which will use its own method
2015-09-10 Derick Rethans <github@derickrethans.nl>
* Better messages for when things go wrong with exceptions
2015-09-10 Derick Rethans <github@derickrethans.nl>
* PHPC-412: HHVM does not do SSL peer verification like PHP
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #111
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: Make BSON exception message consistent with HHVM
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #103
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Split out UTCDateTime toDateTime and toString tests
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: zval_to_bson() should throw on non-Serializable Type objects
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: object_to_bson() should throw on unsupported BSON\Type objects
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: object_to_bson() should encode non-stdClass objects
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Revise debug messages in object_to_bson()
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #108
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* PHPC-418: Getters for WriteConcern properties
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Rename WriteConcern tests
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Move PHONGO_WRITE_CONCERN_W_MAJORITY definition to php_phongo.h
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Revise ReadPreference constructor error messages
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Rename first ReadPreference constructor arg to "mode"
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-418: Getters for ReadPreference properties
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Use valid tag sets in ReadPreference tests
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Rename ReadPreference tests and split constructor error test
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #107
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-417: Return value objects from Manager RP/WC getters
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Declare phongo_cursor_init() statically
2015-09-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #102
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-408: Ensure object_to_bson() always creates a BSON document
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Refactor bson-utcdatetime-001.phpt
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0beta1 release notes
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Add line break between versions in release notes
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0beta1
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #98
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-381: Print whether profile commands were successful
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-381: Server::executeQuery/Command() should take a read preference
2015-09-04 Jeremy Mikola <jmikola@gmail.com>
* Include unknown error domain in log messages
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* Fall back to driver's RuntimeException instead of SPL
2015-09-04 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #100 from bjori/master
2015-09-04 Hannes Magnusson <bjori@php.net>
* s/10gen-labs/mongodb-labs/g after org changes
2015-09-03 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #99 from bjori/master
2015-08-20 Hannes Magnusson <bjori@php.net>
* Bump libmongoc to 1.2-beta1
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #95
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Disable the test for a double wrap with IteratorIterator()
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Disable test that dumps hex codes for generated BSON
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #96
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Fixed getServers test to include milliseconds in UTCDate dumps
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #92
2015-08-30 Jeremy Mikola <jmikola@gmail.com>
* Clean up BSON error tests
2015-09-01 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #80
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-361: Manager::getServers() should omit unknown servers
2015-09-01 Derick Rethans <github@derickrethans.nl>
* Merged pull request #91
2015-08-28 Derick Rethans <github@derickrethans.nl>
* HHVM encodes __pclass last, so disable these tests here.
2015-08-26 Derick Rethans <github@derickrethans.nl>
* phpinfo() behaves totally different in HHVM
2015-08-28 Derick Rethans <github@derickrethans.nl>
* Merged pull request #89
2015-08-27 Derick Rethans <github@derickrethans.nl>
* HHVM does not allow for current() on an object
2015-08-27 Derick Rethans <github@derickrethans.nl>
* Split tests for invalid arguments out into their own files, and ignore them for HHVM
2015-08-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #88
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-337: BSON\Javascript debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-339: BSON\Timestamp debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-340: BSON\UTCDateTime debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-338: BSON\Regex debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* Fix test expectation for builds with top-level BSON namespace
2015-08-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #85
2015-08-21 Hannes Magnusson <bjori@php.net>
* Don't be printing out these commands during execution
2015-08-21 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Update release script to use RELEASE-x.y file
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Merge 1.0.x release notes into RELEASE-1.0
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Merge RELEASE-0.* release notes into RELEASE-0
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0alpha2 release notes
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0alpha2
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #84
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-365: Add src/contrib to Windows build includes
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #81
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0alpha1 release notes
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0alpha1
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Bump minimum PHP version requirement to 5.4
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Use php.net email addresses for authors
2015-08-20 Hannes Magnusson <bjori@php.net>
* Link to the HHVM project
2015-08-20 Hannes Magnusson <bjori@php.net>
* Test running belongs to CONTRIBUTING.md
2015-08-20 Hannes Magnusson <bjori@php.net>
* Add docs for the new PHONGO_SERVERS environment variable
2015-08-20 Hannes Magnusson <bjori@php.net>
* We don't tail master
2015-08-20 Hannes Magnusson <bjori@php.net>
* Merge pull request #82 from derickr/test-name-and-servers
2015-08-20 Derick Rethans <github@derickrethans.nl>
* Do this with an env var instead
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Fix str_replace() newline replacement
2015-08-19 Derick Rethans <github@derickrethans.nl>
* Allow for PHONGO-SERVERS.json in ~ (and fix a test case name)
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #76
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Strip newlines from exception messages for more concise failures
2015-08-05 Derick Rethans <github@derickrethans.nl>
* Added the error message to the failure cases.
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #70
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Add mongoc-host-list.c to config sources
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Fix indentation in config.m4 sources
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Bump libmongoc submodule to 1.2.0-beta
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Restore -Werror compile flag for 5.4+ developer builds
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #78
2015-08-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-271: Server::executeBulkWrite() should take a write concern
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #77
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Split out Manager constructor error tests
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Manager should check client pointer before destroying it
2015-08-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-196: Implement Manager getters for WC and RP
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-353: Return early when there are no options to apply
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-353: Support RP and WC in Manager options array
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Manager constructor should check if URI or client creation fails
2015-07-31 Jeremy Mikola <jmikola@gmail.com>
* Fix memory leak in _phongo_debug_bson()
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #79
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Trim #includes, since src/contrib is already an include path
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #75
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-357: Revise test and relocate to standalone group
2015-08-04 Derick Rethans <github@derickrethans.nl>
* PHPC-357: "invalid namespace" exception should report the namespace
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #74
2015-08-04 Derick Rethans <github@derickrethans.nl>
* PHPC-129: Split out WriteConcern constructor error test
2015-08-04 Derick Rethans <github@derickrethans.nl>
* Merged pull request #73
2015-08-03 Derick Rethans <github@derickrethans.nl>
* Rename BSON\Binary's subType field and getSubType() method to type and getType()
2015-08-04 Derick Rethans <github@derickrethans.nl>
* Merged pull request #72
2015-07-31 Derick Rethans <github@derickrethans.nl>
* Temporary fix for the NULL vs null issue
2015-08-03 Hannes Magnusson <bjori@php.net>
* Make the relative path work
2015-08-03 Hannes Magnusson <bjori@php.net>
* Skip test when not using the test vms
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #69
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-350: Bump libmongoc submodule for updated headers
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #68
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* bson_to_zval() should always initialize state->zchild
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Update extension filename in Travis scripts
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-347: bson_to_zval() leaks when buffer contains no documents
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-345: bson_to_zval() should throw exceptions instead of warnings
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #67
2015-07-28 Jeremy Mikola <jmikola@gmail.com>
* PHPC-334: Split hex_dump() test case
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #64
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHP 5.3 compatibility for tools.php
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* Define str_efree() macro for PHP 5.3 compatibility
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* Compile with no-cast-qual for PHP 5.3
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-344: Allow non-root Serializable to encode as BSON array
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-343: Allow bsonSerialize() to return a stdClass
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-331: Tests for BSON deserialization errors
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: bson_to_zval() serialization spec compatibility
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: __pclass must be both instantiatable and Persistable
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: Apply more validation to type map class
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-336: BSON\Binary debug handler
2015-07-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #66
2015-07-28 Derick Rethans <github@derickrethans.nl>
* Assert what the tests want, and not more
2015-07-28 Derick Rethans <github@derickrethans.nl>
* HHVM does not include the function name, and has two lines of extra stack trace
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #63
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-341: Ensure bson_t is freed after decoding JSON
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #62
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-333: Implement MongoDB\BSON\Binary::getData()
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Fix proto for Binary::getSubType()
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #59
2015-07-15 Hannes Magnusson <bjori@php.net>
* bump debug tests after slight tracing changes
2015-07-15 Hannes Magnusson <bjori@php.net>
* PHPC-229: Support options array in second parameter of Manager ctor
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #61
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-334: Don't produce BSON with multiple __pclass fields
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #60
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* Don't build with -Werror until CDRIVER-757 is resolved
2015-07-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-330: Always include __pclass property when unserializing BSON
2015-07-15 Hannes Magnusson <bjori@php.net>
* Add -Werror into --enable-developer-flags
2015-07-15 Hannes Magnusson <bjori@php.net>
* Move the php_array to contrib/ and rename to _api
2015-07-14 Hannes Magnusson <bjori@php.net>
* We are tracking 1.2.0-dev, not master!
2015-07-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #56
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* Use namespace-agnostic BSON (de)serialization functions
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* Fix from/toJSON() protos
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* PHPC-311: Rename from/toArray() functions to from/toPHP()
2015-07-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-315: Support "root" type mapping for top-level documents
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-319: Convert top-level documents to stdClass by default
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Relax expected class instance in Manager: getServers() test
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Use plural property name to store list of Address objects
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Fix WriteResult::getWriteConcernError() proto
2015-07-08 Hannes Magnusson <bjori@php.net>
* Force 'E' to be present in php.ini so environment variables are picked up
2015-07-07 Hannes Magnusson <bjori@php.net>
* The MongoDB 3.0 repo was moved.
2015-07-07 Hannes Magnusson <bjori@php.net>
* Don't start/stop servers on travis. We don't use MO here yet
2015-07-07 Hannes Magnusson <bjori@php.net>
* PHPC-304: Enable the test again -- and fix typo in the clean section!
2015-07-07 Hannes Magnusson <bjori@php.net>
* Add the START() servers to PHONGO-SERVERS, and remove it with DELETE()
2015-07-07 Hannes Magnusson <bjori@php.net>
* PHPC-303: Cannot connect to healthy Replica Set if seedlist only contains a secondary
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #57
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-325: bson_to_zval() leaks when buffer contains multiple documents
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #55
2015-06-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-306: Check for sasl_client_done in config.m4
2015-07-01 Jeremy Mikola <jmikola@gmail.com>
* Update expected float output after libbson bump
2015-07-01 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #51
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Remove redundant array conversions in phongo_query_init()
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-317: Ensure "sort" query option serializes as BSON object
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-323: The check for system mongoc checks system bson, not mongoc
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-322: Wrong bugtracker URL in configure output
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-321: UTCDatetime -> UTCDateTime
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-321: UTCDatetime -> UTCDateTime
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-309: Bump tests
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-309: Move the BSON namespace under MongoDB\ namespace
2015-06-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #50 from 10gen-labs/jmikola-patch-1
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #49
2015-06-21 Jeremy Mikola <jmikola@gmail.com>
* LDAP VM does not require python-pip (or epel)
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #53
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-308: Skip getmore test until libmongoc issues are resolved
2015-06-21 Jeremy Mikola <jmikola@gmail.com>
* Update install docs, since we now have a PECL package
2015-06-09 Hannes Magnusson <bjori@php.net>
* bump submodule, hopfully fixing build
2015-06-09 Hannes Magnusson <bjori@php.net>
* Fix build after some SDAM changes
2015-06-09 Hannes Magnusson <bjori@php.net>
* install mongo-c-driver required building blocks
2015-06-09 Hannes Magnusson <bjori@php.net>
* PHPC-308: Failed getmore should throw exception
2015-05-22 Hannes Magnusson <bjori@php.net>
* There is no need for these tests to be this slow -- safes 2seconds now
2015-05-22 Hannes Magnusson <bjori@php.net>
* Cluster tests are slow
2015-05-20 Hannes Magnusson <bjori@php.net>
* Fix test -- this isn't a hardcoded ID
2015-05-20 Hannes Magnusson <bjori@php.net>
* Move MO host resolving to tools
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-304: Add a failGetMore trigger
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-291: New cluster/socket/connection tests
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-291: Add a script to convert mo-tests (JSON) to PHPT
2015-05-20 Hannes Magnusson <bjori@php.net>
* These are no longer used
2015-05-18 Hannes Magnusson <bjori@php.net>
* Organize cursor tests
2015-05-20 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #46 from remicollet/issue-driver
2015-05-20 Remi Collet <fedora@famillecollet.com>
* PHPC-305: add --with-libmongo option
2015-05-18 Hannes Magnusson <bjori@php.net>
* Add a helper to know if we are in predictable (vagrant) env or not
2015-05-18 Hannes Magnusson <bjori@php.net>
* Fix server IDs
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve code coverage for the WriteException
2015-05-13 Hannes Magnusson <bjori@php.net>
* Add test for the info/ini section
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve code covergae
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve debug output coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Use the defines
2015-05-13 Hannes Magnusson <bjori@php.net>
* fix test after moving it around
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* improve code coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve test organization
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Server error code coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Fix test on travis
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-301: var_dump()ing Manager should show debug info
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-300: Add var_dump() debug info for Server
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve coverage for the Manager
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-277: Ensure Query always serializes $query as a BSON object
2015-05-13 Hannes Magnusson <bjori@php.net>
* Split the test into success/failure
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-299: Annoying compiler warning
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-298: Coalesce small writes
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-284: Fix LogicException declaration
2015-05-12 Hannes Magnusson <bjori@php.net>
* bump submodules
2015-05-12 Hannes Magnusson <bjori@php.net>
* PHPC-279: Add 2.4 (and 2.6) to build matrix and ensure test suite compatibility
2015-05-06 Hannes Magnusson <bjori@php.net>
* PHPC-296: phongo.debug created for empty values
2015-05-06 Hannes Magnusson <bjori@php.net>
* Bump version
2015-05-06 Hannes Magnusson <bjori@php.net>
* Add 0.6.3 release notes
2015-05-06 Hannes Magnusson <bjori@php.net>
* prep for 0.6.3
2015-05-06 Hannes Magnusson <bjori@php.net>
* PHPC-294: Fix path to build directory
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* back to -dev
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Add 0.6.2 release notes
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Bump stability
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* back to -dev
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Add 0.6.1 release notes
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Bump stability
2015-05-05 Hannes Magnusson <bjori@php.net>
* Fix build outside of srcdir
2015-05-04 Hannes Magnusson <bjori@php.net>
* back to -dev
2015-05-04 Hannes Magnusson <bjori@php.net>
* Add 0.6.0 release notes
2015-05-04 Hannes Magnusson <bjori@php.net>
* Bump stability
2015-05-04 Hannes Magnusson <bjori@php.net>
* Exceptions live in their own folder now
2015-05-04 Hannes Magnusson <bjori@php.net>
* Add coveralls badger
2015-05-04 Hannes Magnusson <bjori@php.net>
* Use the coveralls token for 10gen-labs/mongo-php-driver-prototype not my personal one
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #45 from jmikola/multiple-toArray
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Test for multiple Cursor::toArray() calls
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #44 from jmikola/phpc-255
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-255: Cursors cannot rewind after starting iteration
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Remove tests for multiple iterators on the same Cursor
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Cursor should not yield multiple iterators
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-284: Create MongoDB\Driver\Exception\LogicException class
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #43 from jmikola/phpc-283
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Use common return for zval_to_bson() bsonSerialize() error path
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-283: UnexpectedValueException for invalid bsonSerialize() return value
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #42 from jmikola/phpc-179
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-280: WriteConcern should always set journal/fsync boolean args
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* Document WriteConcern $w param as integer|string
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-179: Show unset journal/fsync as null in WriteConcern debug handler
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #40 from jmikola/phpc-274
2015-04-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-274: Regression test for root BSON\Serializable encoding
2015-04-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-275: object_to_bson() handling for invalid bsonSerialize() retval
2015-04-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-274: Fix zval_to_bson() encoding of BSON\Serializable objects
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #41 from jmikola/phpc-278
2015-04-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-278: nModified may be null for legacy writes
2015-04-27 Hannes Magnusson <bjori@php.net>
* PHPC-269: Travis mojo again
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-272: Move exceptions into MongoDB\Driver\Exception namespace
2015-04-24 Hannes Magnusson <bjori@php.net>
* Post-release-bump-version
2015-04-24 Hannes Magnusson <bjori@php.net>
* Add 0.5.1 release notes
2015-04-24 Hannes Magnusson <bjori@php.net>
* Bump version to 0.5.1-alpha
2015-04-24 Hannes Magnusson <bjori@php.net>
* Include the pre-generated fixtures in the package
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-241: Don't try to use local timezone
2015-04-24 Hannes Magnusson <bjori@php.net>
* Fix extension name -- and recommend the developers flags
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-241: mongodb.debug improvements
2015-04-24 Hannes Magnusson <bjori@php.net>
* Fix unused result warning - and use the localtime in logs
2015-04-23 Hannes Magnusson <bjori@php.net>
* Update testing section and add related section
2015-04-23 Hannes Magnusson <bjori@php.net>
* Fix coveralls build
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-270: Several test fail because of missing enableTestCommands
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-270: add TESTCOMMANDS() skipif to confirm mongod is running with required options
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-269: Fix travis setup
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-268: Update tests to declare which environments they need
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-268: Add NEEDS() function to check if that environment is available
2015-04-23 Hannes Magnusson <bjori@php.net>
* Object IDs change, fix test
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Remove 'faker' as prerequisite from running our full test suite
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Remove on-the-fly composer generated fixtures
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Use the bundled pregenerated fixtures
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-89: Bundle generated fixtures and make them easily loadable
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-260: Allow/use "object" in setTypeMap() as alias/preferred for "stdclass"
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-267; _id generated on embedded document
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-265: BSON encoding unsupoprted types (Resource) should fail
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-266: Add MongoDB\Driver\UnexpectedValueException
2015-04-22 Hannes Magnusson <bjori@php.net>
* Bump copyright -- happy 2015
2015-04-22 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve code coverage
2015-04-22 Hannes Magnusson <bjori@php.net>
* No need for code-coverage for contrib
2015-04-23 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #39 from remicollet/issue-phpc258
2015-04-23 Remi Collet <fedora@famillecollet.com>
* PHPC-258: make all filed needed for test as role="test"
2015-04-22 Hannes Magnusson <bjori@php.net>
* Merge branch 'remicollet-issue-libbson'
2015-04-22 Remi Collet <fedora@famillecollet.com>
* PHPC-259: add --with-libbson option
2015-04-21 Jeremy Mikola <jmikola@gmail.com>
* Mongo Orchestration now works with PyMongo 3.0
2015-04-21 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-04-21 Hannes Magnusson <bjori@php.net>
* Add 0.5.0 release notes
2015-04-21 Hannes Magnusson <bjori@php.net>
* Bump stability
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix tests on 5.3 -- and use consistent db/collection
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix test - set my favorite ini option: date.timezone
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix tests
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-241: Include lib versions and uri in the logs
2015-04-21 Hannes Magnusson <bjori@php.net>
* Use the pretty MONGOC macros
2015-04-21 Hannes Magnusson <bjori@php.net>
* Remove dead code
2015-04-21 Hannes Magnusson <bjori@php.net>
* Move the init function to where all the others are and add folding markers
2015-04-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #37
2015-04-17 Jeremy Mikola <jmikola@gmail.com>
* Current element is already freed in php_phongo_cursor_free()
2015-04-16 Jeremy Mikola <jmikola@gmail.com>
* Test Cursor iteration handlers and ensure rewind doesn't reset position
2015-04-16 Jeremy Mikola <jmikola@gmail.com>
* Tests for multiple iterators sharing the same Cursor
2015-04-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-240: Rely on libmongoc for command cursor iteration
2015-04-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-240: Regression tests for command cursor getmore
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-254: Remove unused RINIT and RSHUTDOWN handlers
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-253: bump mongoc after CDRIVER-611 fix
2015-04-16 Hannes Magnusson <bjori@php.net>
* PHPC-249: empty array should be serialized as array
2015-04-16 Hannes Magnusson <bjori@php.net>
* PHPC-248: Allow ->setTypeMap() to set 'array' and 'stdclass'
2015-04-15 Hannes Magnusson <bjori@php.net>
* PHPC-245: Allow embedding objects in updates
2015-04-15 Hannes Magnusson <bjori@php.net>
* PHPC-245: executeUpdate() converts objects to arrays
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-244: Cannot use object of type Person as array
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-243: Manager->executeUpdate() option is supposed to be 'multi'
2015-04-14 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #35 from bjori/PHPc-239
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-239: Cursor refcount issues
2015-04-14 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #36 from derickr/align-and-missing-break-comment
2015-04-14 Derick Rethans <github@derickrethans.nl>
* Align code and added the "break intentionally ommitted" comment
2015-04-13 Hannes Magnusson <bjori@php.net>
* PHPC-237: Update PHP version requirement in package.xml
2015-04-10 Hannes Magnusson <bjori@php.net>
* post-release pump
2015-04-10 Hannes Magnusson <bjori@php.net>
* Add 0.4.1 release notes
2015-04-10 Jeremy Mikola <jmikola@gmail.com>
* Prep 0.4.1 release
2015-04-10 Hannes Magnusson <bjori@php.net>
* PHPC-236: 5.3-zts build broken
2015-04-10 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-04-10 Hannes Magnusson <bjori@php.net>
* prep 0.4.0 release
2015-04-10 Hannes Magnusson <bjori@php.net>
* Add 0.4.0 release notes
2015-04-10 Hannes Magnusson <bjori@php.net>
* Install ext/zlib so we can pecl install .tgz
2015-04-10 Hannes Magnusson <bjori@php.net>
* mo will automatically upgrade pymongo -- we need to downgrade
2015-04-10 Hannes Magnusson <bjori@php.net>
* mongo-orchestration isn't happy about the recent pymongo3.0 release
2015-04-10 Jeremy Mikola <jmikola@gmail.com>
* Update description for Cursor::getServer()
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-234: Run test suite automatically on FreeBSD 10.1
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-235: Fix out-of-src builds on FreeBSD
2015-04-09 Hannes Magnusson <bjori@php.net>
* Initial script to provision on FreeBSD
2015-04-09 Hannes Magnusson <bjori@php.net>
* Initial script to provision on Windows
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix windows build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Simplify hash and fix windows build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Rename the compat header - its much more then PHP5.3 issues now
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix build on windows -- no strtoll()
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix warning, return in noreturn function
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix zts build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix php_flock() warning on windows
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-213: Disable extra bson type alignment
2015-04-09 Hannes Magnusson <bjori@php.net>
* Bumpidy bump
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-233: Mark the ctor as private for internally created value objects
2015-04-08 Hannes Magnusson <bjori@php.net>
* PHPC-80: Create distcheck target
2015-04-08 Hannes Magnusson <bjori@php.net>
* Convert int64 that overflow 32bit long to strings
2015-04-08 Hannes Magnusson <bjori@php.net>
* Convert overflown int64 to strings and print a warning
2015-04-08 Hannes Magnusson <bjori@php.net>
* Fix path to tests when executed through pecl run-tests
2015-04-08 Hannes Magnusson <bjori@php.net>
* Ignore untracked files in these repos
2015-04-08 Hannes Magnusson <bjori@php.net>
* libbson & mongoc seem to have fixed a lot of warnings -- enable all of ours
2015-04-08 Hannes Magnusson <bjori@php.net>
* Workaround CDRIVER-610
2015-04-08 Hannes Magnusson <bjori@php.net>
* Apparently there is a function for this!
2015-04-08 Hannes Magnusson <bjori@php.net>
* Fix zts build.. TSRMLS_FETCH_FROM_CTX declares variables and therefore must come first
2015-04-07 Hannes Magnusson <bjori@php.net>
* Remove noop log handler
2015-04-07 Hannes Magnusson <bjori@php.net>
* PHPC-231: Manager instances should not free streams that are still in use
2015-04-07 Hannes Magnusson <bjori@php.net>
* bump dependencies for PHPC-231 & PHPC-213
2015-04-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-232: Fix capitalization for WriteResult::getWriteConcern()
2015-04-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-231: Regression test for Manager destruct stream freeing
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #33
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Remove unnecessary php_phongo_cursor_free_current() call
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Re-use cursor_free_current() in cursor_free()
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-215: Fix Cursor iteration through IteratorIterator
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-225: Test Cursor::isDead() and kill on destruct
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-224: Consolidate Result and Cursor classes into one
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-224: Remove Cursor class, which implements Iterator
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-207: Correct serialized data examples for ODS documentation
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-210 & PHPC-209 & PHPC-207 Fix BSON ODM/ODS
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-208: Restrict ODS to "__pclass" fieldnames
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-194: Implement Manager::selectServer() method to wrap SDAM server selection
2015-04-03 Hannes Magnusson <bjori@php.net>
* In PHP5.3 we hit the __wakeUp() which has slightly different exception
2015-04-03 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #34 from serebro/patch-1
2015-04-03 Sergey <sergilyin@gmail.com>
* Docs small fix
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-190: Provide __wakeUp() to disable unserialize()
2015-04-03 Hannes Magnusson <bjori@php.net>
* This apt-get update is slow -- no need to execute it all the time
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-191 && PHPC-192: Add verify_expiry && verify_peer_name certificate verify options
2015-04-02 Hannes Magnusson <bjori@php.net>
* PHPC-223: Use explicit SSL options rather then stream context
2015-04-02 Hannes Magnusson <bjori@php.net>
* Fix setting debug logging as part of the driverOptions
2015-04-02 Hannes Magnusson <bjori@php.net>
* Private Public doesn't exists... This is supposed to be private :D
2015-04-02 Hannes Magnusson <bjori@php.net>
* Cleanup after test
2015-04-02 Hannes Magnusson <bjori@php.net>
* Make it possible to cleanup other db and collections used
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix tests when executed outside of srcroot
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-222: WriteConcernError can cause segfaults on Ubuntu Precise 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-220: BSON\UTCDatetime broken on 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix compile warning on 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix incompatible pointer type in PHP 5.3
2015-04-01 Hannes Magnusson <bjori@php.net>
* Include usable gdbinit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-221: Add Ubuntu Precise (12.04.5) 32bit image
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-219 - BSON\Javascript segfaults on Ubuntu Precise 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-221: Rename the identifier to precise64 as we'll be adding 32bit soon
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #32
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* PHPC-204: Result::toArray() should respect type map configuration
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* PHPC-203: Result::toArray() should proxy iterator_to_array($this)
2015-03-31 Hannes Magnusson <bjori@php.net>
* Make sure we install the latest package in case of multiple rebuilds of same name
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #31
2015-03-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-214: Result does not need custom iterator classes
2015-03-30 Hannes Magnusson <bjori@php.net>
* Forcefully install the new archive, even though it exists
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.5 change the prototype of get_current_key leading to
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: Include our pem files in the pecl archive
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: Use array(), not [], for PHP5.3 compatibility
2015-03-30 Hannes Magnusson <bjori@php.net>
* Split release target into release and packaging
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-218: Provision ubuntu image and install & run the test suite
2015-03-30 Hannes Magnusson <bjori@php.net>
* No need to sudo, run the scripts as priveleged
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.3 test suite fixes
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-217: Include the connection tests in pecl package
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-213: Memory alignment issues on FreeBSD
2015-03-30 Hannes Magnusson <bjori@php.net>
* Fix stability name according to pecl rules
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.3 test suite fixes
2015-03-27 Hannes Magnusson <bjori@php.net>
* Re align
2015-03-27 Hannes Magnusson <bjori@php.net>
* PHPC-212: undefined symbol: _mongoc_sasl_set_service_host - patch by remi@php.net
2015-03-26 Hannes Magnusson <bjori@php.net>
* Ignore coverage files
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump version
2015-03-25 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #28 from jmikola/phpc-201
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add 0.3.1 release notes
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump version for windows packaging fix
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-211: Windows libbson and mongoc config files missing in release archive
2015-03-25 Hannes Magnusson <bjori@php.net>
* Link to the docs on php.net
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use pecl for installing
2015-03-25 Hannes Magnusson <bjori@php.net>
* Bump version
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add 0.3.0 release notes
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add config.w32 to package.xml
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use absolute paths in skipifs too
2015-03-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-201: Rename Result::setTypemap() to setTypeMap()
2015-03-25 Hannes Magnusson <bjori@php.net>
* Update bundles for windows fixes
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Fix header includes on Windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Fix build on 32bit
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Windows doesn't have these compiler attributes
2015-03-25 Hannes Magnusson <bjori@php.net>
* Fix windows bson config
2015-03-25 Hannes Magnusson <bjori@php.net>
* IPHPC-176: Copy build templates, add missing file & set build flags
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use absolute paths on in tests so they can run easier on windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* Absolute path is required to run tests on windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* Allow mongoc_init() to not use our mm
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump mongoc with windows fixes
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-200: Don't set stream initiator when creating client fails
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-199: Missing file from mongoc in config.m4
2015-03-24 Hannes Magnusson <bjori@php.net>
* Initial win32 attempt
2015-03-24 Hannes Magnusson <bjori@php.net>
* Bundle windows configs
2015-03-24 Hannes Magnusson <bjori@php.net>
* Improve code coverage
2015-03-23 Hannes Magnusson <bjori@php.net>
* Simplify
2015-03-23 Hannes Magnusson <bjori@php.net>
* Providing higher init size is worse then providing none
2015-03-23 Hannes Magnusson <bjori@php.net>
* Add raises() helper, similar to throws() except for php warnings/notices/deprecated/...
2015-03-24 Hannes Magnusson <bjori@php.net>
* ignore mongodb*tgz release files and "failed.txt" from run-tests
2015-03-24 Hannes Magnusson <bjori@php.net>
* Bump libbson with timeval fix and mongoc with various sdam fixes
2015-03-23 Jeremy Mikola <jmikola@gmail.com>
* Update PECL install instructions for alpha release
2015-03-23 Hannes Magnusson <bjori@php.net>
* Include the license file for next release
2015-03-23 Hannes Magnusson <bjori@php.net>
* Update naming after PHPC-174
2015-03-23 Hannes Magnusson <bjori@php.net>
* Bump version
2015-03-23 Hannes Magnusson <bjori@php.net>
* Add 0.2.0 release notes
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Rename module registration, constants and so on to mongodb
2015-03-23 Hannes Magnusson <bjori@php.net>
* Bump release to 0.2.0-alpha
2015-03-23 Hannes Magnusson <bjori@php.net>
* Include the version and config templates
2015-03-23 Hannes Magnusson <bjori@php.net>
* Only run our tests as part of release for now
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Rename phongo to mongodb
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Use consistent extension names for PHP and HHVM drivers
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-195: Fix typo and couple of missing incldues
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-195: Remove mongoc/bson header file workarounds
2015-03-23 Hannes Magnusson <bjori@php.net>
* Test for PHPC-186
2015-03-23 Hannes Magnusson <bjori@php.net>
* Remove char * casting, the macro soup leads to incorrect sizeof
2015-03-20 Hannes Magnusson <bjori@php.net>
* Fix zts
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-183: Add -Wdeclaration-after-statement to --enable-developers-flags
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-183: Fix compiler warnings with -Wdeclaration-after-statement
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-189: Implement Manager->getServers()
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-188: Populate MongoDB\Driver\Server
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-24 PHPC-77 PHPC-69 Provide a functioning Server object
2015-03-19 Hannes Magnusson <bjori@php.net>
* bump submodule to mongoc 1.2.0-dev - includes sdam stuff
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Comment out var_dump() data for now
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Enable mongoc SDAM build
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Connect asynchronouslyish
2015-03-19 Hannes Magnusson <bjori@php.net>
* PHPC-106: Implement the new poll callback
2015-03-18 Hannes Magnusson <bjori@php.net>
* In SDAM this is forbidden and throws exception
2015-03-18 Hannes Magnusson <bjori@php.net>
* Show the response when the test fails
2015-03-18 Hannes Magnusson <bjori@php.net>
* Store the original mongoc_uri_t not just the options bson
2015-03-18 Hannes Magnusson <bjori@php.net>
* Add a little tracing love
2015-03-18 Hannes Magnusson <bjori@php.net>
* Properly block on socket writes
2015-03-18 Hannes Magnusson <bjori@php.net>
* Fix null pointer exception
2015-03-17 Hannes Magnusson <bjori@php.net>
* Unhide this
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #27
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* Return const struct pointers from zval getters
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-181: Discard const qualifiers for PHP API
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-181: Use const for pointer args where applicable
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Fix limited batch import
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: No need to sleep anything, we get a fresh connection in next test
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: We now load 1024 users
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: We now generate 1024 users, only load the first 100
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Cache the fixtures
2015-03-16 Hannes Magnusson <bjori@php.net>
* Surpress timezone warning by adding it to the ini
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Rename constant and pass the cleanup uri explicitly
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Replace this Orchestration wrapper with significantly simpler code
2015-03-16 Hannes Magnusson <bjori@php.net>
* Use underscore for the id so we can declare them as constants in php
2015-03-16 Hannes Magnusson <bjori@php.net>
* Use readable name for the replicaset nodes
2015-03-16 Hannes Magnusson <bjori@php.net>
* Minor README updates
2015-03-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #26
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-168: Implement WriteResult::isAcknowledged()
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-170: Don't set write concern on bulk unnecessarily
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-177: Include all fields in WriteConcern debug output
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* Remove unnecessary Manager and apply EXPECTF patterns
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* Update Ubuntu's package repository before installing
2015-03-12 Hannes Magnusson <bjori@php.net>
* Fixed missing type specifier warning
2015-03-12 Hannes Magnusson <bjori@php.net>
* Fix build on MacOSX
2015-03-11 Hannes Magnusson <bjori@php.net>
* Its a bulk
2015-03-11 Hannes Magnusson <bjori@php.net>
* post release bump
2015-03-11 Hannes Magnusson <bjori@php.net>
* Add 0.1.5 release notes
2015-03-11 Hannes Magnusson <bjori@php.net>
* MO now actually creates this initial user, use correct subject to fix the X509 tests
2015-03-11 Hannes Magnusson <bjori@php.net>
* libbson 1.1.2 & mongoc 1.1.2
2015-03-11 Hannes Magnusson <bjori@php.net>
* Add "make help" since I always forget the names
2015-03-05 Hannes Magnusson <bjori@mongodb.com>
* PHP5.6 change serveral TLS verfication defaults
2015-03-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-171: SSL Doesn't work in PHP5.6
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Bump submodules
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Bump bundled version
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Fix tests for MongoDB 3.0.0
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* PHPC-129: Fix tests for HIPPO can't throw InvalidArgumentException on argument errors
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Bump mongoc for PHPC-167
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Add micro-optimization tip for the future
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* PHPC-129: HIPPO can't throw InvalidArgumentException on argument errors
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Simplify debug logging logic when running tests standalone
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* PHPC-163: Throw BulkWriteException on BulkWrite failure
2015-02-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-166: Disable (un)serializing of phongo objects
2015-02-20 Hannes Magnusson <bjori@mongodb.com>
* PHPC-165: Rename WriteBatch to BulkWrite
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-164: Throw MongoDB\Driver\ConnectionTimeoutException
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* This is a Manager, not MongoClient
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* Ignore me. Trim trailing space
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-107: Throw ExecutionTimeoutException for maxTimeMs
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-159: memleak on failed path resolving
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-158: Split queryFlags bitmask option into specific options
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Consolidate CommandResult and QueryResult classes
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: QueryResult and CommandResult are now Result
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* rebase with Result.c
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Renamed getResponseDocument() to toArray()
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Consolidate CommandResult and QueryResult classes
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Remove QueryResult
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-155: WriteConcernError->getInfo() can be scalar
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* Add a note about PHPC-72
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-154: WriteError can have info field
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-153: Rename cursorFlags to queryFlags in Query
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-152: Throw MongoDB\Driver\InvalidArgumentException on argument errors
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* Throw our RuntimeException, not SPL
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* post release bump
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* Add 0.1.4 release notes
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* prep for 0.1.4 release
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-151: Bump to libbson-1.1.0 and mongoc-1.1.0 and fix build
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* This is a result iterator, not cursor
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-149: Iterator holding on to dead results
2015-01-30 Hannes Magnusson <bjori@mongodb.com>
* NULLify after destroy and clear
2015-01-30 Hannes Magnusson <bjori@mongodb.com>
* 0.1.3 is the current release...
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-148: var_dump()ing ObjectID should show the ObjectID
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-144: MO first-user changes
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* Make sure we have a document before dumping it
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* Add SSL to the persistance hash
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* Quick note about var_dump()ing the cursor, rather then calling iterator_to_array()
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-147: Document the ODS
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-146: ReadPreferences swapped
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-145: Typo in example, operators need to use single quotes
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-143: skip auth tests when the server configuration required isn't available
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* Most of our issues with MO seem to be fixed in master
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-142: add 'list-servers' target to enumerate all running MO servers
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-140: var_dump()ing WriteConcernError and WriteError
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-139: var_dump()ing WriteBatch
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-138: var_dump()ing WriteConcern
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-138: var_dump()ing ReadPreference
2015-01-26 Hannes Magnusson <bjori@mongodb.com>
* PHPC-137: var_dump()ing CursorID should show the Cursor ID
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* simplify
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-134: Add the internal results here too
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-136: var_dump() CommandResult and QueryResult
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-133: var_dump()ing cursor
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Fix memory leak var_dump()ing Command
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Fix memory leak var_dump()ing Query and add test
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-134: Add debug info for WriteResult
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Fix segfault on standalone nodes :)
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Implement debug handler for Query and Command
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Fix segfault when var_dump()ing before connecting
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Add var_dump() support for MongoDB\Driver\Manager
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* Revert "PHPC-131: Place the rendered files out of this dir"
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-131: Place the rendered files out of this dir
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-131: Add jira issue collector
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: MO presets directory needs to be configurable
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: if there is no cleanup uri then skipit
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Maybe orchestration doesn't like IPs?
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: more travis debugging
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: ping should be fast
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-130: Update the get_current_key handler to support pre-5.5
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Debugging why mo on travis doesn't start
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: use consistent env variable
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Start the nodes using MO
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: -See if this works better for travis
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Fix travis setup
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-116: Cursor methods should call their respective iterator function handlers
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* Smiplify cursor/results to prep for PHPC-116
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* We don't need to debug this test anymore
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-116: Implement invalidate_current handler to reduce code
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Startup the mongodb-org freshly installed mongodb
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Set the uri to use on travis
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Fix running tests on travis
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* We use corporate coverity now
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHP-127: Fix test, use the string stderr, not resource STDERR
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-42: Implement root level (full document) ODM style serialization
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-125: pointer to out of scope variable :]
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-123: Wrong sizeof argument
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-124: Buffer not null terminated
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-126: Fixed unchecked return
2015-01-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-42: BSON Serialization for classes
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-121: Use BSON\Serialize::bsonSerialize() during serialization
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96: Add QueryResult->setTypemap() to overwrite array/object mapping
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* WriteConcernError test
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* initialize correctly
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* fix title
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96 & PHPC-119 call the new bsonUnserialize method and optimize things a little
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-120: BSON\toArray should support classmap to unserialize as
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-119 && PHPC-49: Create PHP interfaces for BSON (un-)serialization
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* Fix array return
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* No need for these anymore
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* PHPC-118: Use MongoDB\Driver namespace for phongo
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96: Retrieve arrays as custom objects
2014-12-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-117: Simplify bson deserialization code
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-50: Implement checking socket state handler
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* latest and gratest libmongoc fixes
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-115: Remove now-useless GeneratedId
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* If there is no error, pass null to avoid the type hint
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-113: WriteConcernError is just one error, not multiple
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-114: Implement WriteConcernError->getMessage()
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* Avoid invalid read when logging from replicaset
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* Simplify cli debugging
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-112: Sping up ReplicaSet
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* The development of this driver is now under the PHPC jira project
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Bump release version in the docs
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Add 0.1.3 release notes
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Fix paths to root dir .phar
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Add new files to the packager
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Update composer after the repo renaming
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* mongoc requires newer libbson now
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* rename the Mongo Orchestration name to 'mo'
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* MO PR#161 includes fixes from 155, and adds ssl auth support
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-33: Implement X509 support via PHP streams
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Fix typo in persistent hash
2014-12-19 Jeremy Mikola <jmikola@gmail.com>
* Add Apache 2 license
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-33: Add tests for X509
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-104: Throw MongoDB\AuthenticationException on auth failure
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* Fix test titles
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Remove useless stuff
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Workaround https://github.com/10gen/mongo-orchestration/issues/154
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-31: Implement PLAIN authentication via PHP streams
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-31: Test for PLAIN authentication mechanism
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-45: Orchestrate LDAP/PLAIN servers
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-45: Orchestarte PLAIN/LDAP authentication mechanism
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-103: Virtualize OpenLDAP server using CentOS
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Reorganize Vagrantfile to make room for more images
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-2: Persist connection by the dsn
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-101: throw MongoDB\DuplicateKeyException
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Enable test and fixit
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-85: Improve test
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* ignore ctags and local vimrc
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-99: Add & Implement SSLConnectionException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-31: Add stream context options
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-100: Implement connectiontimeoutms
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-31: Do not overload the stream_initiator with tsrm, we want it for stream context later
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-98: Implement and properly throw MongoDB\ConnectionException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-97: Add MongoDB\RuntimeException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-96: Create MongoDB\Exception interface
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-22: New test to verify standard authentication
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-23: Add test for connecting to SSL server
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-6: Split normal SSL and X509 servers
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-3: Orchestrate standard authentication
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-6: Orchestrate SSL and X509
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-7: Trivial Monog Orchestration abstraction
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* exit on failure - and include a greppable error
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-92: Create standalone MongoDB server
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHONG-91: Yes to all questions when installing mongodb
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-91: Use the vm by default, allow it to be overridden by the environment variable
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-5: Whopsy, missing file for startting servers hidden by gitignore
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-91: Use Vagrant to virtualise mongod
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* return true on success
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* Use the MONGODB_URI constant
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* PHON-5: Use Mongo Orchestration to manage MongoDB servers
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* Seperate code from functions
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* remove hyperbole description
2014-12-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #24 from hannesvdvreken/master
2014-12-15 Hannes Van De Vreken <vandevreken.hannes@gmail.com>
* Fixed spelling mistake
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1337: Implement killing a MongoDB Cursor
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1336: Use Cursor->getId(), not Cursor->getCursorId()
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Call the bson module init
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1338: There is actually no DBRef BSON type, its a convention
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\UTCDateTime
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\Timestamp
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\Regex
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\ObjectID
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Improve exception testing
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: uhm.. This is minkey test!
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Increse BSON\Binary testcoverage
2014-12-12 Jeremy Mikola <jmikola@gmail.com>
* Fix composer update and test execution for userland library
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Proper librt linking on platforms that need it
2014-12-12 Jeremy Mikola <jmikola@gmail.com>
* Reformat composer.json and remove redundant autoload block
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Skip phpunit tests for now, its a bit of an chicken-and-egg issue
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Update links after moving the repo to 10gen-labs from bjori
2014-12-11 Hannes Magnusson <bjori@mongodb.com>
* Fix instructions
2014-12-11 Hannes Magnusson <bjori@mongodb.com>
* PHP-1334: Fix build on MacOSX: Don't hardcode librt, we already conditionally check for it
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Require composer deps before test tasks
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Use CRUD's PHPUnit config when running tests
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Use composer update instead of install
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* I have no idea what made me make BSON\Pool
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Run the phongo-crud tests to
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1324: Embed phongo-crud tests under 'testunit' and 'testall' targets
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Add the phongo-crud to the composer autoloader
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc without ssl=prefer
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1329: Remove ssl=prefer option
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Fetch phongo-crud to share its tests
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Search for composer.phar too for those not with it globally installed
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1323: Document install instructions from vcs
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add documentation build and release targets
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Bump install instructions
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add couple of more reminders
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Fix argument passing :]
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add release notes
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1322: More renaming
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1322 Rename count methods in WriteResults
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1320: $batch->update() fails when replacing entire document
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1319: Convert this into normalish cursor
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* PHP-1319: Implement command cursors
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add tracing to mongoc
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* We are throwing exception here, doesn't matter if we are assigning return value
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Throw exception on failure
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Make phongo_throw_exception variadic to improve error messages
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Fix reference counting of nested bson objects
2014-12-04 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-04 Hannes Magnusson <bjori@mongodb.com>
* Commit the release notes
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Take the release notes from the release file
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Lets not actually tag automatically, just ask politely
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Whopsy, we need $$ to read the output
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Update toc and run syntax highlitghting automatically
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Add command docs
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Initial documentation
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Move docs to old-docs making way for actual documentation
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Remove unused command
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Integer IDs can also be int32
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Fix 32bit builds
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Integers are now represented as int32, as long as they fit
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Differenciate the connection type by the SSL option
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Bail out when we cannot connect to the server!
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Error out on 32bit platforms if we cannot represent the int
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Remove Int32 and Int64 classess
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Remove misterious BSON\Log class
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc with ssl fix
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1175: Add Support for SSL=true and SSL=prefer
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1175: Compile against OpenSSL
2014-12-01 Hannes Magnusson <bjori@mongodb.com>
* Improve API consistency between WriteConcern and ReadPreference
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1296: Implement WriteConcerns
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1295: Memory leak when generating ID for inserts
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1294: Emtpy Query Result should still return QueryResult
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Add an example "document browser"
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1293: Writing all debug info is not a good default
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* We only allow object/array here, not need for this extra code
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1292: BSON Arrays should be... PHP Arrays
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1291: memleak when serializing nested objects/array
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Initialize to NULL
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Enable the corrupt BSON handler for debugging
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Add missing arginfo for the BSON encoding functions
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* List commits per release in the RELEASE file
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-11-26 Hannes Magnusson <bjori@10gen.com>
* Update README for current situation
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Ignore the run-tests php.ini
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* We haven't executed the test target yet!
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix coverage build
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Create the tag at the end of making the release ball
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Compiler warnings
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Running the tests is of course part of a release
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Ignore generated files
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Expose version constants and stability
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix version number
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Get the release number from the module
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Update travis for build system changes
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix building out of root
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Generate package.xml and release archive
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Don't Move this to a dedicated patch target
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add CREDITS
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add a target to generate a ChangeLog
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add a custom build target dependency
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* This seems to be the conventional wisdom setting ulimit on travis
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* PHP-1289: Automatically apply our required patches
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* No longer needed
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* PHP-1289: Revamp the build system to embed libmongoc, libbson and yajl
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Set ulimit before our trap
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Don't include libbson or libmongoc in the coverage report
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Fixed CID-60852: Pointer to local outside scope
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* This is the master branch
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Fix ZTS - and all the segfaults
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Attempt to fix stream closing in zts
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fix zts builds
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Use my libmongoc fork for now
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc in my fork
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fixed various memory leaks and compiler warnings
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* PHP-1189: Implement BSON regex type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fixed couple of constify, and renamed a functino to be consistent with'em all
2014-11-11 Jeremy Mikola <jmikola@gmail.com>
* PHP-1189: BSON Regex type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* PHP-1187: Implement BSON binary type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Move the helpers up rather then in the middle of the vtable
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fix some compiler warnings: (de-)constify
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* bump libbson
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1188: Implement BSON code and code with scope types
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fixed zts macros
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1191: Implement BSON timestamp type
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fix arginfo and proto
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fix test: Whoopsy. Missed the DONE section
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1194: Implement BSON MaxKey and MinKey types
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Bump libmongoc, and temporary switch to my fork with the needed patches
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1174: Implement WriteBatch::count()
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1190: Implement BSON\UTCDateTime
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1185: Add more Cursor related methods
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1185: Implement Cursor class
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1183: Implement default Iterator class for QueryResult & CommandResult
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Avoid compiler warnings
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1232: Implement the TODO
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Do not test the error messages from the server
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Tell PHP this is indeed an exposed stream that it doesn't have to worry about
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fix memory leak when splitting a ns
2014-11-18 Hannes Magnusson <bjori@mongodb.com>
* Make sure we have something to free
2014-11-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #22 from hannesvdvreken/patch-1
2014-11-03 Hannes Van De Vreken <vandevreken.hannes@gmail.com>
* Typo in readme? "admit" instead of "admin"
2014-10-20 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #21 from christkv/master
2014-10-20 Christian Kvalheim <christkv@gmail.com>
* Fixed build for OSX and llvm
2014-10-19 Jeremy Mikola <jmikola@gmail.com>
* Rewrite README and document install/test process
2014-10-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #18 from bjori/php1236-test-fixtures
2014-10-16 Jeremy Mikola <jmikola@gmail.com>
* PHP-1180: Create make target to install Composer dependencies (for tests)
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Functional tests for sorted queries
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Use Faker to create user data fixtures
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Use require_once in skip test includes
2014-08-06 Jeremy Mikola <jmikola@gmail.com>
* Use "phongo_test" as default test database
2014-08-06 Jeremy Mikola <jmikola@gmail.com>
* Use preg_replace() for generating collection name from test file
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Clean up hex_dump() source and add citation
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #20
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* PHP-1173: Use string "majority" for WriteConcern::MAJORITY
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* Remove unused class properties in WriteConcern
2014-10-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #19 from bjori/php1230-take-two
2014-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHP-1230: Clean up WriteResult property storage on WriteException
2014-09-30 Jeremy Mikola <jmikola@gmail.com>
* Merge branch 'dry-run'
2014-09-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #16
2014-09-29 Jeremy Mikola <jmikola@gmail.com>
* Use correct return types for WriteResult-related init functions
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Dump WriteResult object in write tests
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Support upserted ids in WriteResult
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Implement WriteResult getter for meta information
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Memory cleanup and getters for WriteResult error zvals
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* Fix tab indentation for generated C code
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Throw WriteException on failed write ops
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1230: Implement WriteException class
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Return exceptions after throwing in case we need to modify them
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Init WriteError and WriteConcernError arrays for WriteResult
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1171: Move WriteConcernError init function to php_phongo.c
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1172: Implement WriteError class
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Fix typo in constant name
2014-09-23 Jeremy Mikola <jmikola@gmail.com>
* Ensure libmongoc structs get freed in WriteBatch and WriteConcern
2014-09-18 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #14 from bjori/php-1171-writeconcernerror
2014-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHP-1171: Implement WriteConcernError class
2014-09-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #13 from bjori/php-1068
2014-09-05 Jeremy Mikola <jmikola@gmail.com>
* PHP-1068: Test that CommandResult is iterable
2014-08-25 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #12
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Always wrap query filter with $query modifier
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Use array helpers instead of hash iteration in Query option parsing
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Error if phongo_query_init() filter isn't array or object
2014-08-14 Jeremy Mikola <jmikola@gmail.com>
* Use ZEND_STRS() when passing string/size arguments
2014-08-14 Jeremy Mikola <jmikola@gmail.com>
* Fix setting of zvals with zend_hash_update() when constructing query
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Update tests for revised Query constructor API
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Change Query constructor args based on CRUD API spec
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Rename query document field in query struct
2014-08-22 Hannes Magnusson <bjori@mongodb.com>
* bump submodules
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* Fix segfault when no namespace is passed
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* BSON: Fix serializing arrays inside of objects
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Move BSON encode/decode stuff into BSON namespace
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Enable a waterfall of compiler instructions for libbson and mongoc
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Supress the initialization output
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* These dirs are required for all normal 'make' targets
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Overwrite the path to libbson that should be linked against
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* debugging travis
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Build against bundled.. just not mongoc bundled
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Remove empty dir since there is nothing to make there
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Hack around mongo-c-driver not allowing us specify libbson location
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Link against libbson and make it available to mongo-c-driver
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Missed a file
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* We submodule these now and automatically build it
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* submodule mongo-c-driver and libbson and build it into phongo
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Reduce mongoc stuff we compile and install
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Link against libmongoc-priv so we can go into the gory details
2014-08-06 Hannes Magnusson <bjori@mongodb.com>
* Implement BSON\ObjectID properly
2014-08-04 Hannes Magnusson <bjori@mongodb.com>
* Fix installing lcov
2014-07-31 Hannes Magnusson <bjori@mongodb.com>
* Only skip it on travis
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* CID-24876: Actually check for the return value and raise a warning now
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Simplify logging domain
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* CID-39604: Fixed possible null dereferencing
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* s/executeWrite/executeWriteBatch/g as the class is called WriteBatch
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Only collect and return the _id if requested - and never $this
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* optimize BSON class' and allow ObjectID to have other then _id key
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Sprinkly tad bit more logging and fix coupleof protos
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Add json_to_bson() function
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Try properly to read as much data as requested
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Copy the oid
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Make BSON types implement BSON\Type interface
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* Remove dirty hack and add a more dirty hack to fetch usable run-tests
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* make sure a empty file doesn't break our build
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* Don't run tests under valgrind on travis... bug in valgrind+libmongoc
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Install libmongoc using mci generated packages
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix bson buffer
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Implement WriteConcern
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* new tests
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix constant generator & regenerate
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Implement readPreferences
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Improve ignore paths
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Travis CI fixes
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* fix path to ignore
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* fix zts
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add __toString() for ObjectID
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Returned generate _id when adding objects to batches
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Improve example
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Add ObjectID support
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Forgotten things for new classes
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Fix \0 in property names (private props, ...)
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add the ability to automatically generate _id
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Better way to run the tests through valgrind
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Missing new class
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add BSON objects and move generated classes into its own folders
2014-07-18 Jeremy Mikola <jmikola@gmail.com>
* Only use GeneratedId for upserts, not inserts
2014-07-18 Jeremy Mikola <jmikola@gmail.com>
* Replace createFromServers() factory method with getServers()
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Create WriteConcern value object
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #10 from bjori/make-testclean
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Replace clean-tests.sh with make target
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Run the tests under valgrind on travis
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Revise Manager::executeUpdate() error test
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Fix warning for bson_uint32_to_string() string pointer arg
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Shell script to clean up leftover test files
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Fix constants value
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Regenerate after coverity fixes
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Ignore the bundled zval array helper header
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* tralalalllala. It really needs to be dedicated branch
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* make clean first as it had already been built by compile.sh
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Get coverity to build the dry-run branch automatically
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* I just learned about trap
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24870: Unchecked return value from library
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24872: Comment out not-yet-implemented code
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24873: Unreachable code whoopsy!
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24875: Fix uninitialized variable
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Avoid a deadcode warning from coverity
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Coverity link
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Update API listing
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Who doesn't like badges
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* skip on travis..
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Fix constants value
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Add a new none flag
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Generate all the C objects based on the PHP code
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Add the actual implementation into the PHP API docs
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Add a compare_objects handler for Server objects and always try to have a mongoc_host_t for it
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* CS
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* No need for this hack anymore
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* We want latest and greatest mongodb
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Use bson_uint32_to_string() rather the spprintf()
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Fix the remaining tests
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Get tests to pass
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* fix test
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* fix tests
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* whopsy
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* revert accidental removal
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Revert accidental removal
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Extract the hint from the cursor
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* No longer needed
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* api changes
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Easier to maintain in a single file
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Regenerated
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Update bootsrapper
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Fix classname
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Add a zval array helper
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Add support for delete options
2014-07-09 Jeremy Mikola <jmikola@gmail.com>
* PHP-1136: Allow custom cursor classes from command/query results
2014-07-09 Jeremy Mikola <jmikola@gmail.com>
* Remove *.php from gitignore
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Initial Server implementation (as read-only object..)
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Fix test
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* We have to save the results so they don't get posted to qa.php.net
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* pretend object_properties_init() exists on PHP5.3
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Only run coveralls on success
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Install libbson and libmongoc masters rather then releases
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Cosmetics and remove dead function
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Remove batch hacks & added single_[insert|update|delete]
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Touch up WriteResult as return value
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1138: Use Zend MM for libbson
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1137: Removed ugly private API hacks
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Return correct Result class
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Initialize optional arg as NULL
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Fix tests and push getServer() info down
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Remove no-longer valid classes
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Add ReadPreferences and full Query support
2014-07-08 Jeremy Mikola <jmikola@gmail.com>
* Consolidate write result classes into WriteResult
2014-07-07 Jeremy Mikola <jmikola@gmail.com>
* Add phpt files to gitignore
2014-07-07 Jeremy Mikola <jmikola@gmail.com>
* Tests for constants and Server/Manager execute methods
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Fix calling continue in global scope
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Return MongoDB\Result when executing commands too
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* print out our configure output
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Batch test and fix skipping test during cleanup phase
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Dead code
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Imlement batch execution
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* FIXME: libmongoc workarounds...
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Fix type hint
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Missing batch ctor
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* avoid bogus files showing up on coverage reports
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Simplify Batch interface
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* See if this has any affect on coveralls..
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* we need newer lcov then howmany decades old the one in repo is
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Missing lcov on travis for coverage
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Bump to latest release
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* guess the directory needs to exist
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Compile libmongoc from the src/ dir so we can steal the private header
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Rename it to _default so we don't conflict the actual defaults
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Make sure spl is loaded before we are in static builds
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* fix zts
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Renamed error const
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Some zts fixes
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Fix building as a static extension
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* ignore test files
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Simplify testing
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Better logging
2014-07-01 Hannes Magnusson <bjori@mongodb.com>
* Return a result object and implement an iterator for it
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* remove useless code
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* rly?
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* New class
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* semicolon
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* make it final and update to match the docs
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* fqd
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* wip query
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* wip
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* Add a generic result object that can be iterated over via iteratoraggregate
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* This cursor needs a firstBatch, just like the CommandCursor
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* fixed warnings and alloc
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* blah
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* wip
2014-06-26 Hannes Magnusson <bjori@mongodb.com>
* Added logging to files and command executing
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Create a mongoc_client from URI
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* More cruft for objects
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Remove duplicate include
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* phongo api...
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Register default object handlers
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Add runtime error domain enum - and a wrapper to get exception type
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Lets not enable developers flags on travis until we get a valid build first :)
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Add BSON tests
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Initial BSON implementation
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Fix include path
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Quick hack to install libmongoc on travis
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Add travis and coveralls support
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Update description per review from Jeremy
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Implement basics of phongo_exception_from_mongoc_domain()
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Implement the phongo_exception_from_phongo_domain() function
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Isolate all PHP compatability stuff into its own file
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* PHP Extension CRUFT for phongo
2014-06-17 Hannes Magnusson <bjori@mongodb.com>
* Add config.m4
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Skeleton implementation of the userland classes/methods
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Add .gitignore
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Add descriptions
2014-06-19 Hannes Magnusson <bjori@php.net>
* Merge pull request #5 from bjori/fix-query-flags
2014-06-19 Jeremy Mikola <jmikola@gmail.com>
* Fix bit values for query flags
2014-06-17 Hannes Magnusson <bjori@php.net>
* Merge pull request #3 from bjori/docblocks
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Change some @see into @param or @param and add some descriptions
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Lets not start out with complicated zpp...
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Fix return value
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Fix docblock param order
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Add a bootstrapping file that includes all other files
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Pass through php -l
2014-06-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #2 from bjori/split-classes
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Specity write options in execute methods, not batch constructors
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Command execution takes a database name, not a namespace
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Add cursor flag constants
2014-06-12 Jeremy Mikola <jmikola@gmail.com>
* Implement review feedback
2014-06-12 Jeremy Mikola <jmikola@gmail.com>
* Split API classes and interfaces
2014-05-14 Derick Rethans <github@derickrethans.nl>
* Fixed unintialized variable
2014-05-13 Hannes Magnusson <bjori@php.net>
* The CRUD examples are now multiple separate files
2014-05-13 Hannes Magnusson <bjori@php.net>
* Merge pull request #1 from bjori/split-crud
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Query constructor should take query object, not just criteria
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Use value objects and make QueryResult IteratorAggregate
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Split and modify CRUD examples
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Add basic .gitignore
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Initial draft of suggested API
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Example of a wishful API
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Initial commit
diff --git a/mongodb-1.1.5/LICENSE b/mongodb-1.1.6/LICENSE
similarity index 100%
rename from mongodb-1.1.5/LICENSE
rename to mongodb-1.1.6/LICENSE
diff --git a/mongodb-1.1.5/Makefile.frag b/mongodb-1.1.6/Makefile.frag
similarity index 100%
rename from mongodb-1.1.5/Makefile.frag
rename to mongodb-1.1.6/Makefile.frag
diff --git a/mongodb-1.1.5/README.md b/mongodb-1.1.6/README.md
similarity index 100%
rename from mongodb-1.1.5/README.md
rename to mongodb-1.1.6/README.md
diff --git a/mongodb-1.1.5/RELEASE-0 b/mongodb-1.1.6/RELEASE-0
similarity index 100%
rename from mongodb-1.1.5/RELEASE-0
rename to mongodb-1.1.6/RELEASE-0
diff --git a/mongodb-1.1.5/RELEASE-1.0 b/mongodb-1.1.6/RELEASE-1.0
similarity index 100%
rename from mongodb-1.1.5/RELEASE-1.0
rename to mongodb-1.1.6/RELEASE-1.0
diff --git a/mongodb-1.1.5/RELEASE-1.1 b/mongodb-1.1.6/RELEASE-1.1
similarity index 98%
rename from mongodb-1.1.5/RELEASE-1.1
rename to mongodb-1.1.6/RELEASE-1.1
index bda0a551..18824599 100644
--- a/mongodb-1.1.5/RELEASE-1.1
+++ b/mongodb-1.1.6/RELEASE-1.1
@@ -1,615 +1,627 @@
+RELEASE 1.1.5
+-------------
+2016-03-18 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-632: Define MONGOC_NO_AUTOMATIC_GLOBALS when bundling libmongoc
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.1.4 release notes
+
+
RELEASE 1.1.4
-------------
2016-03-10 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.4
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-620: Lowercase hexadecimal strings in ObjectID ctor
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* Fix test title
2016-03-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-623: Fix 64-bit integer conversion for BSON keys
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.3 release notes
RELEASE 1.1.3
-------------
2016-03-04 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.3
2016-03-03 Jeremy Mikola <jmikola@gmail.com>
* Skip PHPC-545 test on HHVM due to __pclass encoding order
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* Improve comment in bson-toJSON_error-001.phpt
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-613: toJSON() should throw if bson_as_json() fails
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-615: Return after throwing for bson_reader_read() error
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-616: Document and array visitors should throw for corrupt BSON
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-531: Fix double free in corrupt BSON visitor
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* toPHP() regression tests for bson_reader_read() errors
2016-03-02 Jeremy Mikola <jmikola@gmail.com>
* Prevent duplication and reduce strlen() usage
2016-03-01 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-506: Use more descriptive messages in WriteExceptions
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-414: Combine 32-bit and 64-bit UTCDateTime debug handler tests
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-593: Binary type is an unsigned 8-bit integer
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-594: Timestamp components are unsigned 32-bit integers
2016-02-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-595: Throw exception if wtimeout > INT32_MAX
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* Use INT32 limit constants instead of INT/LONG
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-544: Use phongo_long in UTCDateTime ctor
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-544: Consult SIZEOF_ZEND_LONG for 64-bit integer support
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* Remove unused macro, which is already defined in libbson
2016-02-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-592: ADD_ASSOC_STRINGL() can only be used with string literals
2016-02-29 Jeremy Mikola <jmikola@gmail.com>
* Revert "Merge pull request #241"
2016-02-24 Jeremy Mikola <jmikola@gmail.com>
* wip
2016-02-24 Jeremy Mikola <jmikola@gmail.com>
* Fix whitespace
2016-02-22 Jeremy Mikola <jmikola@gmail.com>
* Fix BulkWrite::update() "multi" option usage in docs
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-545: Regression test for Peristable bug report
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-550: Always encode ODS field when serializing Persistable documents
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* Regression test for executing BulkWrite multiple times
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Fix test title
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* Tests should use and cleanup their own collection
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-581: Use ConnectionTimeoutException for server selection failures
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-582: Manager::selectServer() should select exception class based on bson_error_t
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Relax expected output patterns for HHVM
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Check for connection exceptions in exec and SS methods
2016-02-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-553: Suppress warnings during stream creation
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-566: Remove request_id from Manager::__debugInfo()
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-567: Bump config.m4 library deps
2016-02-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-567: Upgrade libbson and libmongoc to 1.3.3
2016-02-12 Derick Rethans <github@derickrethans.nl>
* Skip this test on HHVM, as its DateTime class is ancient and behaves differently
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-523: Parse readconcernlevel in URI options array
2016-02-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-563: Remove undocumented Manager "hosts" URI option
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-539: Include read concern in Query debug output
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* Regression test for extending final classes
2016-02-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-519: Add missing modifiers to final class methods
2016-02-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-538: ObjectID should not abort on null ctor arg
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-515: Test that negative cursor limits return one batch
2016-01-20 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-543: MongoDB\BSON\UTCDateTime on 32 bit platforms parse argument wrong
2016-02-02 Derick Rethans <github@derickrethans.nl>
* Fixed PHPC-558: Upgrade libmongoc and libbson to 1.3.2
2016-02-02 Jeremy Mikola <jmikola@gmail.com>
* Remove Manager::executeInsert() usage in ODS docs
2016-01-12 Derick Rethans <github@derickrethans.nl>
* Skip and fix test for HHVM with ReadConcerns
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.2 release notes
RELEASE 1.1.2
-------------
2016-01-07 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.2
2016-01-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-496: Revert "Temporary workaround for warning in mongoc"
2016-01-06 Jeremy Mikola <jmikola@gmail.com>
* Improve other config.m4 check messages
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* Improve SASL check message
2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
* Don't print pcre-dir usage during configure check
2016-01-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-529: Prefix BSON functions to avoid symbol conflicts
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* phongo_bson_append() can be static and get zval type internally
2015-12-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-528: Support zval references when appending BSON
2015-12-30 Remi Collet <fedora@famillecollet.com>
* PHPC-527: fix call to add_index_stringl
2015-12-26 Remi Collet <fedora@famillecollet.com>
* PHPC-527: Fix PHP 7 / 32bits build
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.1 release notes
RELEASE 1.1.1
-------------
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.1
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Allow for PHP 7.x support in package.xml
2015-12-16 Jeremy Mikola <jmikola@gmail.com>
* Fix protos for ReadPreference and WriteConcern
2015-12-22 Kanin Peanviriyakulkit <dogrocker@users.noreply.github.com>
* Remove "beta" in doc.
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: VC14 needs timezone defined for SSL function
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Fix syntax for empty struct initializer
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed test case, where PHP 5 and PHP 7 call the type differently
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed 'dump on uninitialised value' with BSON deserialisation
2015-12-16 Derick Rethans <github@derickrethans.nl>
* Fixed issues with PHP 7 and the new ReadConcern
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed CS from Joe's patch
2015-12-14 Joe Watkins <krakjoe@php.net>
* fix leaks and logical errors for PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-405: Additional zval* to zval changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-397: Additional RETURN_STRING updates
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Don't BSON-encode non-public properties in PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-374: zend_string updates for OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-404: Additional hash API changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-399: Additional zval_used_for_init cleanup
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Add the testcase from the report
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Segfault when using Manager through singleton class
2015-09-02 Hannes Magnusson <bjori@php.net>
* Use ZVAL_COPY_VALUE()
2015-09-01 Hannes Magnusson <bjori@php.net>
* Enable PHP7 on Travis
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-391 & PHPC-389: Stream and SSL API changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-387: Properly init the iterator, and don't free it on dtor
2015-09-01 Hannes Magnusson <bjori@php.net>
* _id doesn't have to be object
2015-09-01 Hannes Magnusson <bjori@php.net>
* Fix incorrect version checks
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-405: zval drop a level; zval*->zval, zval**->zval*
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-404: off-by-one hash api changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-390: php.ini updates
2015-08-31 Hannes Magnusson <bjori@php.net>
* littlebit to eager on the zend_string, this is PHP5
2015-08-31 Hannes Magnusson <bjori@php.net>
* Get the zend_string value
2015-08-31 Hannes Magnusson <bjori@php.net>
* hash API changes, off-by-ones
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: Use the compatability macros to get the object
2015-08-31 Hannes Magnusson <bjori@php.net>
* Properly initialize the zval* we are working with
2015-08-31 Hannes Magnusson <bjori@php.net>
* +1 in PHP5, not PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* Include numeric keys as well
2015-09-01 Patrick Boyd <pboyd04@gmail.com>
* Object property names missing due to lack of key length
2015-08-31 Hannes Magnusson <bjori@php.net>
* Should all compile now!
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simpilfy iterating over a zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* Use Z_ISUNDEF() to check the zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* WS
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-400: Handle IS_TRUE and IS_FALSE
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simplify IS_ARRAY/IS_OBJECT discovery for PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() and zval* -> zval upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* We already know the length
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* str_efree() not defined in PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_*() should RETURN ! :)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-399: zval_used_for_init is no longer needed (or defined)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-398: zend_parse_parameter 's' expects a char* and size_t now
2015-08-28 Patrick Boyd <pboyd04@gmail.com>
* PHP7 upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() is gone
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_STRING() duplicate argument removed
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-387: get_current_data() API changes
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: Use our bc type for free_object argument
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-396: HashTable no longer contains nApplyCount
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-394: Fix issue with WriteException and zend_read_property
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: PHP7 create/free object changes
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: create/free object handlers for PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* Define the TODOs for PHP5, these are PHP7 TODOs
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: Remove leftover braces
2015-08-27 Hannes Magnusson <bjori@php.net>
* Sprinkle TODOs -- it compiles now!
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-374: php_stream_xport_create() now wants zend_string
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-388 - dtor on bson_to_zval() failure
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-387: Iterator API changes
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: add_assoc_string_ex() doesn't have a duplicate param in PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-384: php_stream's no longer have resource ids
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-383: Simplify getting the current exception zval*
2015-08-26 Hannes Magnusson <bjori@php.net>
* PHPC-376: Cursor var_dump() is weird
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Remove MAKE_STD_ZVAL() usage
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-374: zend_string* vs char* PHP API changes (1/many)
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-372: zend_throw_exception() return value changes
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Start a phongo_compat.c with things that shouldn't be done in headers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Lets start with just php_phongo.c for now
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-371: Prep for PHP7 resource changes
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: Hardcode return_value_used to 1 in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: return_value_ptr and return_value_used removed in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Use the new Z_<CLASSNAME>_OBJ_P() macros
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-368: Refactor MongoDB\Driver\Manager ctor
2015-08-24 Hannes Magnusson <bjori@php.net>
* Fix const casting warning in php_array_api
2015-08-24 Hannes Magnusson <bjori@php.net>
* Resync with GitHub: https://github.com/sgolemon/php-array-api
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Include libbson and libmongoc version files in PECL package
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.0 release notes
RELEASE 1.1.0
-------------
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Initial release notes for 1.1 series
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.0
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-509: Default Manager URI to "mongodb://localhost:27017/"
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Fix arginfo for ReadConcern constructor
2015-12-12 Jorgen Evens <jorgen@evens.eu>
* PHPC-514: Fix --with-mongodb-sasl flag
2015-12-14 Hannes Magnusson <bjori@php.net>
* PHPC-512: Disable async stream connections
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-508: Construct valid stream URI for IPv6 literals
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Manager::getReadConcern() and URI test
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Support readConcern option on Query
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Implement ReadConcern class
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Fix include for mongoc-write-concern-private.h
2015-12-11 Hannes Magnusson <bjori@php.net>
* Fix package license to be consistent with the source files
2015-12-11 Hannes Magnusson <bjori@php.net>
* Accept MongoDB 3.2 package repo public keys on test VM
2015-12-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-443: Support "bypassDocumentValidation" option in BulkWrite
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Update package repo public key for Travis CI builds
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Define STANDALONE as MongoDB 3.2 on Travis CI
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Bump libmongoc for CDRIVER-1046 memory leak fix
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: failReceivedGetmore does not support getMore commands
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Don't assert exact isMaster response when dumping Servers
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Split query tests for OP_QUERY and find command
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Add MongoDB 3.0 replica set test environment
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Profiled aggregate commands log the collection NS in 3.2
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Update open cursor check for MongoDB 3.2
2015-12-10 Derick Rethans <github@derickrethans.nl>
* Use more descriptive unused value
2015-12-07 Hannes Magnusson <bjori@php.net>
* Fixed PHPC-502: bson_init_static(): precondition failed: data
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Use consistent name for MongoDB 3.0 test server
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Enable majority read concern by default in MO
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Use MongoDB 3.2 final for testing
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Make server startup via MO more robust
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Register STANDALONE-3.0 with the test suite
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* STANDALONE-3.0 port conflicted with STANDALONE-2.4
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Bump libmongoc and libbson to 1.3.0 releases
2015-12-02 Derick Rethans <github@derickrethans.nl>
* This code has changed in 3.2, and make the error message clear
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added 3.2.0rc5 to our Mongo Orchestration suite
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added some more phpt test leftovers to .gitignore
2015-12-08 Remi Collet <fedora@famillecollet.com>
* libmongoc 1.3 is not compatible
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Revise prep-release.php handling
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.1 release notes
diff --git a/mongodb-1.1.6/RELEASE-1.1.6 b/mongodb-1.1.6/RELEASE-1.1.6
new file mode 100644
index 00000000..4223a6ca
--- /dev/null
+++ b/mongodb-1.1.6/RELEASE-1.1.6
@@ -0,0 +1,36 @@
+RELEASE 1.1.6
+-------------
+2016-04-05 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-667: Fix check for existing "_id" field during BulkWrite::insert()
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * Consolidate shell variable assignments with AC_SUBST()
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-657: Support MONGOC_NO_AUTOMATIC GLOBALS configure flag
+
+2016-03-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-657: Upgrade libbson and libmongoc to 1.3.5
+
+2016-03-28 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
+
+2016-03-15 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-564: Use macros for accessing write result int32 fields
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-564, PHPC-626: WriteResult should use libmongoc's public API
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Fix title for PHPC-155 regression test
+
+2016-03-10 Jeremy Mikola <jmikola@gmail.com>
+ * Consolidate PHP 7 conditional in WriteResult debug handler
+
+2016-03-18 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2016-03-18 Jeremy Mikola <jmikola@gmail.com>
+ * Package 1.1.5
+
+
diff --git a/mongodb-1.1.5/Vagrantfile b/mongodb-1.1.6/Vagrantfile
similarity index 100%
rename from mongodb-1.1.5/Vagrantfile
rename to mongodb-1.1.6/Vagrantfile
diff --git a/mongodb-1.1.5/config.m4 b/mongodb-1.1.6/config.m4
similarity index 97%
rename from mongodb-1.1.5/config.m4
rename to mongodb-1.1.6/config.m4
index 4a465211..0f1e8951 100644
--- a/mongodb-1.1.5/config.m4
+++ b/mongodb-1.1.6/config.m4
@@ -1,573 +1,572 @@
dnl config.m4 for extension mongodb
PHP_ARG_ENABLE(mongodb, whether to enable mongodb support,
[ --enable-mongodb Enable mongodb support])
PHP_ARG_WITH(openssl-dir, OpenSSL dir for mongodb,
[ --with-openssl-dir[=DIR] openssl install prefix], yes, no)
dnl borrowed from PHP acinclude.m4
AC_DEFUN([PHP_BSON_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
[
ac_cv_c_bigendian_php=unknown
AC_TRY_RUN(
[
int main(void)
{
short one = 1;
char *cp = (char *)&one;
if (*cp == 0) {
return(0);
} else {
return(1);
}
}
], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
])
if test $ac_cv_c_bigendian_php = yes; then
- BSON_BYTE_ORDER=4321
+ AC_SUBST(BSON_BYTE_ORDER, 4321)
else
- BSON_BYTE_ORDER=1234
+ AC_SUBST(BSON_BYTE_ORDER, 1234)
fi
- AC_SUBST(BSON_BYTE_ORDER)
])
dnl Borrowed from sapi/fpm/config.m4
AC_DEFUN([PHP_BSON_CLOCK],
[
have_clock_gettime=no
AC_MSG_CHECKING([for clock_gettime])
AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
have_clock_gettime=yes
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
if test "$have_clock_gettime" = "no"; then
AC_MSG_CHECKING([for clock_gettime in -lrt])
SAVED_LIBS="$LIBS"
LIBS="$LIBS -lrt"
AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
have_clock_gettime=yes
AC_MSG_RESULT([yes])
], [
LIBS="$SAVED_LIBS"
AC_MSG_RESULT([no])
])
fi
if test "$have_clock_gettime" = "yes"; then
- BSON_HAVE_CLOCK_GETTIME=1
- AC_SUBST(BSON_HAVE_CLOCK_GETTIME)
+ AC_SUBST(BSON_HAVE_CLOCK_GETTIME, 1)
fi
])
MONGOC_SYMBOL_SUFFIX="priv"
AC_MSG_CHECKING(PHP version)
PHP_FOUND_VERSION=`${PHP_CONFIG} --version`
PHP_FOUND_VERNUM=`echo "${PHP_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
AC_MSG_RESULT($PHP_FOUND_VERNUM)
if test "$MONGODB" != "no"; then
PHP_ARG_ENABLE(developer-flags, whether to enable developer build flags,
[ --enable-developer-flags Enable developer flags],, no)
if test "$PHP_DEVELOPER_FLAGS" = "yes"; then
dnl Warn about functions which might be candidates for format attributes
PHP_CHECK_GCC_ARG(-Wmissing-format-attribute, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wmissing-format-attribute")
dnl Avoid duplicating values for an enum
PHP_CHECK_GCC_ARG(-Wduplicate-enum, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wduplicate-enum")
dnl Warns on mismatches between #ifndef and #define header guards
PHP_CHECK_GCC_ARG(-Wheader-guard, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wheader-guard")
dnl logical not of a non-boolean expression
PHP_CHECK_GCC_ARG(-Wlogical-not-parentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-not-parentheses")
dnl Warn about suspicious uses of logical operators in expressions
PHP_CHECK_GCC_ARG(-Wlogical-op, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op")
dnl memory error detector.
dnl FIXME: -fsanitize=address,undefined for clang. The PHP_CHECK_GCC_ARG macro isn't happy about that string :(
PHP_CHECK_GCC_ARG(-fsanitize-address, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fsanitize-address")
dnl Enable frame debugging
PHP_CHECK_GCC_ARG(-fno-omit-frame-pointer, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-omit-frame-pointer")
dnl Make sure we don't optimize calls
PHP_CHECK_GCC_ARG(-fno-optimize-sibling-calls, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-optimize-sibling-calls")
PHP_CHECK_GCC_ARG(-Wlogical-op-parentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op-parentheses")
PHP_CHECK_GCC_ARG(-Wbool-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion")
PHP_CHECK_GCC_ARG(-Wloop-analysis, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wloop-analysis")
PHP_CHECK_GCC_ARG(-Wsizeof-array-argument, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wsizeof-array-argument")
PHP_CHECK_GCC_ARG(-Wstring-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wstring-conversion")
PHP_CHECK_GCC_ARG(-Wno-variadic-macros, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-variadic-macros")
PHP_CHECK_GCC_ARG(-Wno-sign-compare, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-sign-compare")
PHP_CHECK_GCC_ARG(-fstack-protector, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fstack-protector")
PHP_CHECK_GCC_ARG(-fno-exceptions, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-exceptions")
PHP_CHECK_GCC_ARG(-Wformat-security, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-security")
PHP_CHECK_GCC_ARG(-Wformat-nonliteral, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-nonliteral")
PHP_CHECK_GCC_ARG(-Winit-self, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Winit-self")
PHP_CHECK_GCC_ARG(-Wwrite-strings, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wwrite-strings")
PHP_CHECK_GCC_ARG(-Wenum-compare, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wenum-compare")
PHP_CHECK_GCC_ARG(-Wempty-body, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wempty-body")
PHP_CHECK_GCC_ARG(-Wparentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wparentheses")
PHP_CHECK_GCC_ARG(-Wdeclaration-after-statement, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdeclaration-after-statement")
if test "$PHP_FOUND_VERNUM" -ge "50400"; then
PHP_CHECK_GCC_ARG(-Werror, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
fi
MAINTAINER_CFLAGS="-Wextra $_MAINTAINER_CFLAGS -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-missing-field-initializers"
STD_CFLAGS="-g -O0 -Wall"
dnl EXTRA_LDFLAGS="-Wl,--no-undefined"
fi
PHP_ARG_ENABLE(coverage, whether to enable code coverage,
[ --enable-coverage Enable developer code coverage information],, no)
if test "$PHP_COVERAGE" = "yes"; then
PHP_CHECK_GCC_ARG(-fprofile-arcs, COVERAGE_CFLAGS="$COVERAGE_CFLAGS -fprofile-arcs")
PHP_CHECK_GCC_ARG(-ftest-coverage, COVERAGE_CFLAGS="$COVERAGE_CFLAGS -ftest-coverage")
EXTRA_LDFLAGS="$COVERAGE_CFLAGS"
fi
MONGODB_BSON="\
src/bson.c \
";
MONGODB_BSON_CLASSES="\
src/BSON/Type.c \
src/BSON/Unserializable.c \
src/BSON/Serializable.c \
src/BSON/Persistable.c \
src/BSON/Binary.c \
src/BSON/Javascript.c \
src/BSON/MaxKey.c \
src/BSON/MinKey.c \
src/BSON/ObjectID.c \
src/BSON/Regex.c \
src/BSON/Timestamp.c \
src/BSON/UTCDateTime.c \
";
MONGODB_ROOT="\
php_phongo.c \
phongo_compat.c \
";
MONGODB_CONTRIB="\
src/contrib/php-ssl.c \
";
MONGODB_MONGODB_CLASSES="\
src/MongoDB/Command.c \
src/MongoDB/Cursor.c \
src/MongoDB/CursorId.c \
src/MongoDB/Manager.c \
src/MongoDB/Query.c \
src/MongoDB/ReadConcern.c \
src/MongoDB/ReadPreference.c \
src/MongoDB/Server.c \
src/MongoDB/BulkWrite.c \
src/MongoDB/WriteConcern.c \
src/MongoDB/WriteConcernError.c \
src/MongoDB/WriteError.c \
src/MongoDB/WriteResult.c \
";
MONGODB_MONGODB_EXCEPTIONS="\
src/MongoDB/Exception/Exception.c \
src/MongoDB/Exception/LogicException.c \
src/MongoDB/Exception/RuntimeException.c \
src/MongoDB/Exception/UnexpectedValueException.c \
src/MongoDB/Exception/InvalidArgumentException.c \
src/MongoDB/Exception/ConnectionException.c \
src/MongoDB/Exception/AuthenticationException.c \
src/MongoDB/Exception/SSLConnectionException.c \
src/MongoDB/Exception/ExecutionTimeoutException.c \
src/MongoDB/Exception/ConnectionTimeoutException.c \
src/MongoDB/Exception/WriteException.c \
src/MongoDB/Exception/BulkWriteException.c \
";
YAJL_SOURCES="\
yajl_version.c \
yajl.c \
yajl_encode.c \
yajl_lex.c \
yajl_parser.c \
yajl_buf.c \
yajl_tree.c \
yajl_alloc.c \
yajl_gen.c
";
BSON_SOURCES="\
bcon.c \
bson.c \
bson-atomic.c \
bson-clock.c \
bson-context.c \
bson-error.c \
bson-iter.c \
bson-iso8601.c \
bson-json.c \
bson-keys.c \
bson-md5.c \
bson-memory.c \
bson-oid.c \
bson-reader.c \
bson-string.c \
bson-timegm.c \
bson-utf8.c \
bson-value.c \
bson-version-functions.c \
bson-writer.c
";
MONGOC_SOURCES="\
mongoc-array.c \
mongoc-async.c \
mongoc-async-cmd.c \
mongoc-buffer.c \
mongoc-bulk-operation.c \
mongoc-b64.c \
mongoc-client.c \
mongoc-client-pool.c \
mongoc-cluster.c \
mongoc-collection.c \
mongoc-counters.c \
mongoc-cursor.c \
mongoc-cursor-array.c \
mongoc-cursor-transform.c \
mongoc-cursor-cursorid.c \
mongoc-database.c \
mongoc-find-and-modify.c \
mongoc-init.c \
mongoc-gridfs.c \
mongoc-gridfs-file.c \
mongoc-gridfs-file-page.c \
mongoc-gridfs-file-list.c \
mongoc-host-list.c \
mongoc-index.c \
mongoc-list.c \
mongoc-log.c \
mongoc-matcher-op.c \
mongoc-matcher.c \
mongoc-memcmp.c \
mongoc-opcode.c \
mongoc-queue.c \
mongoc-read-concern.c \
mongoc-read-prefs.c \
mongoc-rpc.c \
mongoc-set.c \
mongoc-server-description.c \
mongoc-server-stream.c \
mongoc-socket.c \
mongoc-stream.c \
mongoc-stream-buffered.c \
mongoc-stream-file.c \
mongoc-stream-gridfs.c \
mongoc-stream-socket.c \
mongoc-topology.c \
mongoc-topology-scanner.c \
mongoc-topology-description.c \
mongoc-uri.c \
mongoc-util.c \
mongoc-version-functions.c \
mongoc-write-command.c \
mongoc-write-concern.c
";
MONGOC_SOURCES_SSL="\
mongoc-rand.c \
mongoc-scram.c \
mongoc-stream-tls.c \
mongoc-ssl.c
";
MONGOC_SOURCES_SASL=mongoc-sasl.c
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_CONTRIB)
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_CONTRIB, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
fi
PHP_ARG_WITH(libbson, whether to use system libbson,
[ --with-libbson Use system libbson], no, no)
if test "$PHP_LIBBSON" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libbson)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
if $PKG_CONFIG libbson-1.0 --atleast-version 1.3.3; then
LIBBSON_INC=`$PKG_CONFIG libbson-1.0 --cflags`
LIBBSON_LIB=`$PKG_CONFIG libbson-1.0 --libs`
LIBBSON_VER=`$PKG_CONFIG libbson-1.0 --modversion`
AC_MSG_RESULT(version $LIBBSON_VER found)
else
AC_MSG_ERROR(system libbson must be upgraded to version >= 1.3.3)
fi
else
AC_MSG_ERROR(pkgconfig and libbson must be installed)
fi
PHP_EVAL_INCLINE($LIBBSON_INC)
PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
fi
dnl libmongoc stuff {{{
AC_MSG_CHECKING(configuring libmongoc)
AC_MSG_RESULT(...)
PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
[ --with-libmongoc Use system libmongoc], no, no)
AC_DEFINE(HAVE_MONGOC, 1, [Kinda useless extension without it..])
if test "$PHP_LIBMONGOC" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libmongoc)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0 && $PKG_CONFIG --exists libmongoc-priv; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.3.3; then
LIBMONGOC_INC=`$PKG_CONFIG libmongoc-priv --cflags`
LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-priv --libs`
LIBMONGOC_VER=`$PKG_CONFIG libmongoc-priv --modversion`
AC_MSG_RESULT(version $LIBMONGOC_VER found)
CFLAGS="$CFLAGS -DMONGOC_I_AM_A_DRIVER"
else
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.3.3)
fi
else
AC_MSG_ERROR(pkgconfig and mongoc must be installed)
fi
PHP_EVAL_INCLINE($LIBMONGOC_INC)
PHP_EVAL_LIBLINE($LIBMONGOC_LIB, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
else
- CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE -DMONGOC_NO_AUTOMATIC_GLOBALS"
+ CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE"
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
MONGOC_ENABLE_SSL=1
AC_SUBST(MONGOC_ENABLE_SSL)
+ AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
fi
PHP_ARG_WITH(pcre-dir, for pcre-dir install prefix,
[ --with-pcre-dir[=DIR] mongodb: pcre install prefix], auto, yes)
if test "$PHP_PCRE_DIR" != "no"; then
AC_MSG_CHECKING(for pcre)
for i in $PHP_PCRE_DIR /usr /usr/local; do
if test -f $i/include/pcre.h; then
MONGODB_PCRE_DIR=$i/include
AC_MSG_RESULT(found in $i)
break
fi
done
if test -z "$MONGODB_PCRE_DIR"; then
AC_MSG_RESULT(not found)
else
PHP_ADD_INCLUDE($MONGODB_PCRE_DIR)
fi
fi
PHP_ARG_WITH(mongodb-sasl, for Cyrus SASL support,
[ --with-mongodb-sasl[=DIR] mongodb: Include Cyrus SASL support], auto, no)
if test "$PHP_MONGODB_SASL" != "no"; then
AC_MSG_CHECKING(for SASL)
for i in $PHP_MONGODB_SASL /usr /usr/local; do
if test -f $i/include/sasl/sasl.h; then
MONGODB_SASL_DIR=$i
AC_MSG_RESULT(found in $i)
break
fi
done
if test -z "$MONGODB_SASL_DIR"; then
AC_MSG_RESULT(not found)
if test "$PHP_MONGODB_SASL" != "auto"; then
AC_MSG_ERROR([sasl.h not found!])
else
AC_SUBST(MONGOC_ENABLE_SASL, 0)
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
fi
else
PHP_CHECK_LIBRARY(sasl2, sasl_version,
[
PHP_ADD_INCLUDE($MONGODB_SASL_DIR)
PHP_ADD_LIBRARY_WITH_PATH(sasl2, $MONGODB_SASL_DIR/$PHP_LIBDIR, MONGODB_SHARED_LIBADD)
MONGOC_ENABLE_SASL=1
AC_SUBST(MONGOC_ENABLE_SASL)
], [
if test "$MONGODB_SASL" != "auto"; then
AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])
fi
], [
-L$MONGODB_SASL_DIR/$PHP_LIBDIR
])
PHP_CHECK_LIBRARY(sasl2, sasl_client_done,
[
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
], [
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
])
fi
else
AC_SUBST(MONGOC_ENABLE_SASL, 0)
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
fi
m4_include(src/libmongoc/build/autotools/WeakSymbols.m4)
m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
AX_PTHREAD
AC_CHECK_FUNCS([shm_open], [SHM_LIB=], [AC_CHECK_LIB([rt], [shm_open], [SHM_LIB=-lrt], [SHM_LIB=])])
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $SHM_LIB"
dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, MONGODB_SHARED_LIBADD)
dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, MONGODB_SHARED_LIBADD)
EXTRA_CFLAGS="$PTHREAD_CFLAGS $SASL_CFLAGS"
PHP_SUBST(EXTRA_CFLAGS)
PHP_SUBST(EXTRA_LDFLAGS)
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
PHP_SUBST(MONGODB_SHARED_LIBADD)
dnl }}}
PHP_NEW_EXTENSION(mongodb, $MONGODB_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
PHP_ADD_EXTENSION_DEP(mongodb, spl)
PHP_ADD_INCLUDE([$ext_srcdir/src/BSON/])
PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/])
PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/Exception/])
PHP_ADD_INCLUDE([$ext_srcdir/src/contrib/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/BSON/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/Exception/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/contrib/])
if test "$PHP_LIBMONGOC" == "no"; then
PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/mongoc/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
fi
if test "$PHP_LIBBSON" == "no"; then
m4_include(src/libbson/build/autotools/CheckAtomics.m4)
m4_include(src/libbson/build/autotools/FindDependencies.m4)
m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
AC_CREATE_STDINT_H([$srcdir/src/libbson/src/bson/bson-stdint.h])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/yajl/])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/bson/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
fi
dnl MONGODB_SHARED_DEPENDENCIES="mongodbdep"
dnl PHP_SUBST(MONGODB_SHARED_DEPENDENCIES)
PHP_BSON_BIGENDIAN
AC_HEADER_STDBOOL
- BSON_EXTRA_ALIGN=0
- AC_SUBST(BSON_EXTRA_ALIGN)
+ AC_SUBST(BSON_EXTRA_ALIGN, 0)
if test "$ac_cv_header_stdbool_h" = "yes"; then
- BSON_HAVE_STDBOOL_H=1
+ AC_SUBST(BSON_HAVE_STDBOOL_H, 1)
else
- BSON_HAVE_STDBOOL_H=0
+ AC_SUBST(BSON_HAVE_STDBOOL_H, 0)
fi
- AC_SUBST(BSON_HAVE_STDBOOL_H)
- BSON_OS=1
- AC_SUBST(BSON_OS)
+ AC_SUBST(BSON_OS, 1)
PHP_BSON_CLOCK
AC_CHECK_FUNC(strnlen,ac_cv_func_strnlen=yes,ac_cv_func_strnlen=no)
if test "$ac_cv_func_strnlen" = "yes"; then
- BSON_HAVE_STRNLEN=1
+ AC_SUBST(BSON_HAVE_STRNLEN, 1)
+ else
+ AC_SUBST(BSON_HAVE_STRNLEN, 0)
fi
- AC_SUBST(BSON_HAVE_STRNLEN)
+
AC_CHECK_FUNC(snprintf,ac_cv_func_snprintf=yes,ac_cv_func_snprintf=no)
if test "$ac_cv_func_snprintf" = "yes"; then
- BSON_HAVE_SNPRINTF=1
+ AC_SUBST(BSON_HAVE_SNPRINTF, 1)
+ else
+ AC_SUBST(BSON_HAVE_SNPRINTF, 0)
fi
- AC_SUBST(BSON_HAVE_SNPRINTF)
if test "$PHP_LIBMONGOC" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libmongoc/
m4_include(src/libmongoc/build/autotools/Versions.m4)
srcdir=${backup_srcdir}
MONGOC_API_VERSION=1.0
AC_SUBST(MONGOC_MAJOR_VERSION)
AC_SUBST(MONGOC_MINOR_VERSION)
AC_SUBST(MONGOC_MICRO_VERSION)
AC_SUBST(MONGOC_API_VERSION)
AC_SUBST(MONGOC_VERSION)
AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-config.h)
AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
fi
if test "$PHP_LIBBSON" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libbson/
m4_include(src/libbson/build/autotools/Versions.m4)
srcdir=${backup_srcdir}
BSON_API_VERSION=1.0
AC_SUBST(BSON_MAJOR_VERSION)
AC_SUBST(BSON_MINOR_VERSION)
AC_SUBST(BSON_MICRO_VERSION)
AC_SUBST(BSON_API_VERSION)
AC_SUBST(BSON_VERSION)
AC_OUTPUT($srcdir/src/libbson/src/bson/bson-config.h)
AC_OUTPUT($srcdir/src/libbson/src/bson/bson-version.h)
fi
dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
PHP_ADD_MAKEFILE_FRAGMENT
AC_CONFIG_COMMANDS_POST([echo "
mongodb was configured with the following options:
Build configuration:
CFLAGS : $CFLAGS
Extra CFLAGS : $STD_CFLAGS $EXTRA_CFLAGS
Developers flags (slow) : $MAINTAINER_CFLAGS
Code Coverage flags (extra slow) : $COVERAGE_CFLAGS
System mongoc : $PHP_LIBMONGOC
System libbson : $PHP_LIBBSON
LDFLAGS : $LDFLAGS
EXTRA_LDFLAGS : $EXTRA_LDFLAGS
MONGODB_SHARED_LIBADD : $MONGODB_SHARED_LIBADD
Please submit bugreports at:
https://jira.mongodb.org/browse/PHPC
"])
fi
dnl: vim: et sw=2
diff --git a/mongodb-1.1.5/config.w32 b/mongodb-1.1.6/config.w32
similarity index 100%
rename from mongodb-1.1.5/config.w32
rename to mongodb-1.1.6/config.w32
diff --git a/mongodb-1.1.5/phongo_compat.c b/mongodb-1.1.6/phongo_compat.c
similarity index 100%
rename from mongodb-1.1.5/phongo_compat.c
rename to mongodb-1.1.6/phongo_compat.c
diff --git a/mongodb-1.1.5/phongo_compat.h b/mongodb-1.1.6/phongo_compat.h
similarity index 100%
rename from mongodb-1.1.5/phongo_compat.h
rename to mongodb-1.1.6/phongo_compat.h
diff --git a/mongodb-1.1.5/php_bson.h b/mongodb-1.1.6/php_bson.h
similarity index 100%
rename from mongodb-1.1.5/php_bson.h
rename to mongodb-1.1.6/php_bson.h
diff --git a/mongodb-1.1.5/php_phongo.c b/mongodb-1.1.6/php_phongo.c
similarity index 96%
rename from mongodb-1.1.5/php_phongo.c
rename to mongodb-1.1.6/php_phongo.c
index e413531a..4eec549f 100644
--- a/mongodb-1.1.5/php_phongo.c
+++ b/mongodb-1.1.6/php_phongo.c
@@ -1,2659 +1,2593 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include "bson.h"
#include "mongoc.h"
#include "mongoc-cursor-cursorid-private.h"
#include "mongoc-read-prefs-private.h"
#include "mongoc-bulk-operation-private.h"
#include "mongoc-read-concern-private.h"
#include "mongoc-write-concern-private.h"
#include "mongoc-uri-private.h"
#include "mongoc-trace.h"
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/file.h>
#include <Zend/zend_hash.h>
#include <Zend/zend_interfaces.h>
#include <Zend/zend_exceptions.h>
#include <ext/spl/spl_iterators.h>
#include <ext/spl/spl_exceptions.h>
/* Stream wrapper */
#include <main/php_streams.h>
#include <main/php_network.h>
/* Debug log writing */
#include <main/php_open_temporary_file.h>
/* For formating timestamp in the log */
#include <ext/date/php_date.h>
/* String manipulation */
#include <Zend/zend_string.h>
/* PHP array helpers */
#include "php_array_api.h"
/* For our stream verifications */
#include <openssl/x509.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
#include "php-ssl.h"
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "PHONGO"
#define PHONGO_DEBUG_INI "mongodb.debug"
#define PHONGO_DEBUG_INI_DEFAULT ""
#define PHONGO_STREAM_BUFFER_SIZE 4096
ZEND_DECLARE_MODULE_GLOBALS(mongodb)
#if PHP_VERSION_ID >= 70000
#if defined(ZTS) && defined(COMPILE_DL_MONGODB)
ZEND_TSRMLS_CACHE_DEFINE();
#endif
#endif
/* {{{ phongo_std_object_handlers */
zend_object_handlers phongo_std_object_handlers;
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void)
{
return &phongo_std_object_handlers;
}
/* }}} */
/* {{{ Error reporting and logging */
zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain)
{
switch (domain) {
case PHONGO_ERROR_INVALID_ARGUMENT:
return php_phongo_invalidargumentexception_ce;
case PHONGO_ERROR_LOGIC:
return php_phongo_logicexception_ce;
case PHONGO_ERROR_RUNTIME:
return php_phongo_runtimeexception_ce;
case PHONGO_ERROR_UNEXPECTED_VALUE:
return php_phongo_unexpectedvalueexception_ce;
case PHONGO_ERROR_MONGOC_FAILED:
return php_phongo_runtimeexception_ce;
case PHONGO_ERROR_WRITE_FAILED:
return php_phongo_bulkwriteexception_ce;
case PHONGO_ERROR_CONNECTION_FAILED:
return php_phongo_connectionexception_ce;
}
MONGOC_ERROR("Resolving unknown phongo error domain: %d", domain);
return php_phongo_runtimeexception_ce;
}
zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code)
{
switch(code) {
case 50: /* ExceededTimeLimit */
return php_phongo_executiontimeoutexception_ce;
case MONGOC_ERROR_STREAM_SOCKET:
case MONGOC_ERROR_SERVER_SELECTION_FAILURE:
return php_phongo_connectiontimeoutexception_ce;
case MONGOC_ERROR_CLIENT_AUTHENTICATE:
return php_phongo_authenticationexception_ce;
case MONGOC_ERROR_STREAM_INVALID_TYPE:
case MONGOC_ERROR_STREAM_INVALID_STATE:
case MONGOC_ERROR_STREAM_NAME_RESOLUTION:
case MONGOC_ERROR_STREAM_CONNECT:
case MONGOC_ERROR_STREAM_NOT_ESTABLISHED:
return php_phongo_connectionexception_ce;
case MONGOC_ERROR_CLIENT_NOT_READY:
case MONGOC_ERROR_CLIENT_TOO_BIG:
case MONGOC_ERROR_CLIENT_TOO_SMALL:
case MONGOC_ERROR_CLIENT_GETNONCE:
case MONGOC_ERROR_CLIENT_NO_ACCEPTABLE_PEER:
case MONGOC_ERROR_CLIENT_IN_EXHAUST:
case MONGOC_ERROR_PROTOCOL_INVALID_REPLY:
case MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION:
case MONGOC_ERROR_CURSOR_INVALID_CURSOR:
case MONGOC_ERROR_QUERY_FAILURE:
/*case MONGOC_ERROR_PROTOCOL_ERROR:*/
case MONGOC_ERROR_BSON_INVALID:
case MONGOC_ERROR_MATCHER_INVALID:
case MONGOC_ERROR_NAMESPACE_INVALID:
case MONGOC_ERROR_COMMAND_INVALID_ARG:
case MONGOC_ERROR_COLLECTION_INSERT_FAILED:
case MONGOC_ERROR_GRIDFS_INVALID_FILENAME:
case MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND:
case MONGOC_ERROR_QUERY_NOT_TAILABLE:
return php_phongo_runtimeexception_ce;
}
switch (domain) {
case MONGOC_ERROR_CLIENT:
case MONGOC_ERROR_STREAM:
case MONGOC_ERROR_PROTOCOL:
case MONGOC_ERROR_CURSOR:
case MONGOC_ERROR_QUERY:
case MONGOC_ERROR_INSERT:
case MONGOC_ERROR_SASL:
case MONGOC_ERROR_BSON:
case MONGOC_ERROR_MATCHER:
case MONGOC_ERROR_NAMESPACE:
case MONGOC_ERROR_COMMAND:
case MONGOC_ERROR_COLLECTION:
case MONGOC_ERROR_GRIDFS:
/* FIXME: We don't have the Exceptions mocked yet.. */
#if 0
return phongo_ce_mongo_connection_exception;
#endif
default:
return php_phongo_runtimeexception_ce;
}
}
void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
{
va_list args;
char *message;
int message_len;
va_start(args, format);
message_len = vspprintf(&message, 0, format, args);
zend_throw_exception(phongo_exception_from_phongo_domain(domain), message, 0 TSRMLS_CC);
efree(message);
va_end(args);
}
void phongo_throw_exception_from_bson_error_t(bson_error_t *error TSRMLS_DC)
{
zend_throw_exception(phongo_exception_from_mongoc_domain(error->domain, error->code), error->message, error->code TSRMLS_CC);
}
static void php_phongo_log(mongoc_log_level_t log_level, const char *log_domain, const char *message, void *user_data)
{
PHONGO_TSRMLS_FETCH_FROM_CTX(user_data);
(void)user_data;
switch(log_level) {
case MONGOC_LOG_LEVEL_ERROR:
case MONGOC_LOG_LEVEL_CRITICAL:
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "%s", message);
return;
case MONGOC_LOG_LEVEL_WARNING:
case MONGOC_LOG_LEVEL_MESSAGE:
case MONGOC_LOG_LEVEL_INFO:
case MONGOC_LOG_LEVEL_DEBUG:
case MONGOC_LOG_LEVEL_TRACE:
{
time_t t;
phongo_char *dt;
time(&t);
dt = php_format_date((char *)"Y-m-d\\TH:i:sP", strlen("Y-m-d\\TH:i:sP"), t, 0 TSRMLS_CC);
fprintf(MONGODB_G(debug_fd), "[%s] %10s: %-8s> %s\n", phongo_str(dt), log_domain, mongoc_log_level_str(log_level), message);
fflush(MONGODB_G(debug_fd));
efree(dt);
} break;
}
}
/* }}} */
/* {{{ Init objects */
static void phongo_cursor_init(zval *return_value, mongoc_cursor_t *cursor, mongoc_client_t *client TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *intern;
object_init_ex(return_value, php_phongo_cursor_ce);
intern = Z_CURSOR_OBJ_P(return_value);
intern->cursor = cursor;
intern->server_id = mongoc_cursor_get_hint(cursor);
intern->client = client;
} /* }}} */
void phongo_server_init(zval *return_value, mongoc_client_t *client, int server_id TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *server;
object_init_ex(return_value, php_phongo_server_ce);
server = Z_SERVER_OBJ_P(return_value);
server->client = client;
server->server_id = server_id;
}
/* }}} */
void phongo_readconcern_init(zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC) /* {{{ */
{
php_phongo_readconcern_t *intern;
object_init_ex(return_value, php_phongo_readconcern_ce);
intern = Z_READCONCERN_OBJ_P(return_value);
intern->read_concern = mongoc_read_concern_copy(read_concern);
}
/* }}} */
void phongo_readpreference_init(zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC) /* {{{ */
{
php_phongo_readpreference_t *intern;
object_init_ex(return_value, php_phongo_readpreference_ce);
intern = Z_READPREFERENCE_OBJ_P(return_value);
intern->read_preference = mongoc_read_prefs_copy(read_prefs);
}
/* }}} */
void phongo_writeconcern_init(zval *return_value, const mongoc_write_concern_t *write_concern TSRMLS_DC) /* {{{ */
{
php_phongo_writeconcern_t *intern;
object_init_ex(return_value, php_phongo_writeconcern_ce);
intern = Z_WRITECONCERN_OBJ_P(return_value);
intern->write_concern = mongoc_write_concern_copy(write_concern);
}
/* }}} */
int32_t phongo_bson_find_as_int32(bson_t *bson, const char *key, int32_t fallback)
{
bson_iter_t iter;
if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_INT32(&iter)) {
return bson_iter_int32(&iter);
}
return fallback;
}
bool phongo_bson_find_as_bool(bson_t *bson, const char *key, bool fallback)
{
bson_iter_t iter;
if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_BOOL(&iter)) {
return bson_iter_bool(&iter);
}
return fallback;
}
void phongo_bson_iter_as_document(const bson_iter_t *iter, uint32_t *document_len, const uint8_t **document)
{
*document = NULL;
*document_len = 0;
if (BSON_ITER_HOLDS_DOCUMENT(iter) || BSON_ITER_HOLDS_ARRAY(iter)) {
memcpy (document_len, (iter->raw + iter->d1), sizeof (*document_len));
*document_len = BSON_UINT32_FROM_LE (*document_len);
*document = (iter->raw + iter->d1);
}
}
bool phongo_query_init(php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
if (options) {
query->batch_size = phongo_bson_find_as_int32(options, "batchSize", 0);
query->limit = phongo_bson_find_as_int32(options, "limit", 0);
query->skip = phongo_bson_find_as_int32(options, "skip", 0);
query->flags = 0;
query->flags |= phongo_bson_find_as_bool(options, "tailable", false) ? MONGOC_QUERY_TAILABLE_CURSOR : 0;
query->flags |= phongo_bson_find_as_bool(options, "slaveOk", false) ? MONGOC_QUERY_SLAVE_OK : 0;
query->flags |= phongo_bson_find_as_bool(options, "oplogReplay", false) ? MONGOC_QUERY_OPLOG_REPLAY : 0;
query->flags |= phongo_bson_find_as_bool(options, "noCursorTimeout", false) ? MONGOC_QUERY_NO_CURSOR_TIMEOUT : 0;
query->flags |= phongo_bson_find_as_bool(options, "awaitData", false) ? MONGOC_QUERY_AWAIT_DATA : 0;
query->flags |= phongo_bson_find_as_bool(options, "exhaust", false) ? MONGOC_QUERY_EXHAUST : 0;
query->flags |= phongo_bson_find_as_bool(options, "partial", false) ? MONGOC_QUERY_PARTIAL : 0;
if (bson_iter_init_find(&iter, options, "modifiers")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected modifiers to be array or object, %d given", bson_iter_type(&iter));
return false;
}
bson_iter_document(&iter, &len, &data);
if (len) {
bson_t tmp;
bson_init_static(&tmp, data, len);
bson_copy_to_excluding_noinit(&tmp, query->query, "not-used-value", NULL);
bson_destroy (&tmp);
}
}
if (bson_iter_init_find(&iter, options, "projection")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected projection to be array or object, %d given", bson_iter_type(&iter));
return false;
}
bson_iter_document(&iter, &len, &data);
if (len) {
query->selector = bson_new_from_data(data, len);
}
}
if (bson_iter_init_find(&iter, options, "sort")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected sort to be array or object, %d given", bson_iter_type(&iter));
return false;
}
phongo_bson_iter_as_document(&iter, &len, &data);
if (len) {
bson_t tmp;
bson_init_static(&tmp, data, len);
bson_append_document(query->query, "$orderby", -1, &tmp);
bson_destroy(&tmp);
}
}
}
BSON_APPEND_DOCUMENT(query->query, "$query", filter);
return true;
} /* }}} */
zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
php_phongo_writeconcernerror_t *writeconcernerror;
writeconcernerror = Z_WRITECONCERNERROR_OBJ_P(return_value);
if (bson_iter_init_find(&iter, bson, "code") && BSON_ITER_HOLDS_INT32(&iter)) {
writeconcernerror->code = bson_iter_int32(&iter);
}
if (bson_iter_init_find(&iter, bson, "errmsg") && BSON_ITER_HOLDS_UTF8(&iter)) {
writeconcernerror->message = bson_iter_dup_utf8(&iter, NULL);
}
if (bson_iter_init_find(&iter, bson, "errInfo") && BSON_ITER_HOLDS_DOCUMENT(&iter)) {
uint32_t len;
const uint8_t *data;
bson_iter_document(&iter, &len, &data);
if (!data) {
return false;
}
if (!phongo_bson_to_zval(data, len, &writeconcernerror->info)) {
zval_ptr_dtor(&writeconcernerror->info);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&writeconcernerror->info);
#else
writeconcernerror->info = NULL;
#endif
return false;
}
}
return true;
} /* }}} */
zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
php_phongo_writeerror_t *writeerror;
writeerror = Z_WRITEERROR_OBJ_P(return_value);
if (bson_iter_init_find(&iter, bson, "code") && BSON_ITER_HOLDS_INT32(&iter)) {
writeerror->code = bson_iter_int32(&iter);
}
if (bson_iter_init_find(&iter, bson, "errmsg") && BSON_ITER_HOLDS_UTF8(&iter)) {
writeerror->message = bson_iter_dup_utf8(&iter, NULL);
}
if (bson_iter_init_find(&iter, bson, "errInfo")) {
bson_t info;
bson_init(&info);
bson_append_iter(&info, NULL, 0, &iter);
if (!phongo_bson_to_zval(bson_get_data(&info), info.len, &writeerror->info)) {
zval_ptr_dtor(&writeerror->info);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&writeerror->info);
#else
writeerror->info = NULL;
#endif
return false;
}
}
if (bson_iter_init_find(&iter, bson, "index") && BSON_ITER_HOLDS_INT32(&iter)) {
writeerror->index = bson_iter_int32(&iter);
}
return true;
} /* }}} */
-php_phongo_writeresult_t *phongo_writeresult_init(zval *return_value, mongoc_write_result_t *write_result, mongoc_client_t *client, int server_id TSRMLS_DC) /* {{{ */
+php_phongo_writeresult_t *phongo_writeresult_init(zval *return_value, bson_t *reply, mongoc_client_t *client, int server_id TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *writeresult;
object_init_ex(return_value, php_phongo_writeresult_ce);
writeresult = Z_WRITERESULT_OBJ_P(return_value);
+ writeresult->reply = bson_copy(reply);
writeresult->client = client;
writeresult->server_id = server_id;
- /* Copy write_results or else it'll get destroyed with the bulk destruction */
-#define SCP(field) writeresult->write_result.field = write_result->field
- SCP(omit_nModified);
- SCP(nInserted);
- SCP(nMatched);
- SCP(nModified);
- SCP(nRemoved);
- SCP(nUpserted);
-
- bson_copy_to(&write_result->upserted, &writeresult->write_result.upserted);
- SCP(n_writeConcernErrors);
- bson_copy_to(&write_result->writeConcernErrors, &writeresult->write_result.writeConcernErrors);
- bson_copy_to(&write_result->writeErrors, &writeresult->write_result.writeErrors);
- SCP(upsert_append_count);
-#undef SCP
-
return writeresult;
-
} /* }}} */
/* }}} */
/* {{{ CRUD */
/* Splits a namespace name into the database and collection names, allocated with estrdup. */
bool phongo_split_namespace(const char *namespace, char **dbname, char **cname) /* {{{ */
{
char *dot = strchr(namespace, '.');
if (!dot) {
return false;
}
if (cname) {
*cname = estrdup(namespace + (dot - namespace) + 1);
}
if (dbname) {
*dbname = estrndup(namespace, dot - namespace);
}
return true;
} /* }}} */
mongoc_bulk_operation_t *phongo_bulkwrite_init(zend_bool ordered) { /* {{{ */
return mongoc_bulk_operation_new(ordered);
} /* }}} */
-static void phongo_bulk_write_error_add_message(char **tmp_msg, bson_t *errors)
-{
- bson_iter_t iter;
-
- bson_iter_init(&iter, errors);
-
- while (bson_iter_next(&iter)) {
- bson_t cbson;
- uint32_t len;
- const uint8_t *data;
- bson_iter_t inner_iter;
-
- if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
- continue;
- }
-
- bson_iter_document(&iter, &len, &data);
-
- if (!bson_init_static(&cbson, data, len)) {
- continue;
- }
-
- if (bson_iter_init_find(&inner_iter, &cbson, "errmsg") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
- const char *tmp_errmsg = bson_iter_utf8(&inner_iter, NULL);
- size_t tmp_errmsg_len = strlen(tmp_errmsg);
-
- *tmp_msg = erealloc(*tmp_msg, strlen(*tmp_msg) + tmp_errmsg_len + 5);
- strncpy(*tmp_msg + strlen(*tmp_msg), " :: ", 5);
- strncpy(*tmp_msg + strlen(*tmp_msg), tmp_errmsg, tmp_errmsg_len + 1);
- }
- }
-}
-
-static char* phongo_assemble_bulk_write_error(mongoc_write_result_t *write_result)
-{
- char *tmp_msg = emalloc(sizeof("BulkWrite error"));
-
- strncpy(tmp_msg, "BulkWrite error", sizeof("BulkWrite error"));
-
- if (!bson_empty0(&write_result->writeErrors)) {
- phongo_bulk_write_error_add_message(&tmp_msg, &write_result->writeErrors);
- }
-
- if (!bson_empty0(&write_result->writeConcernErrors)) {
- phongo_bulk_write_error_add_message(&tmp_msg, &write_result->writeConcernErrors);
- }
-
- return tmp_msg;
-}
-
bool phongo_execute_write(mongoc_client_t *client, const char *namespace, mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
bson_error_t error;
char *dbname;
char *collname;
int success;
+ bson_t reply = BSON_INITIALIZER;
php_phongo_writeresult_t *writeresult;
if (!phongo_split_namespace(namespace, &dbname, &collname)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s: %s", "Invalid namespace provided", namespace);
return false;
}
mongoc_bulk_operation_set_database(bulk, dbname);
mongoc_bulk_operation_set_collection(bulk, collname);
mongoc_bulk_operation_set_client(bulk, client);
/* If a write concern was not specified, libmongoc will use the client's
* write concern; however, we should still fetch it for the write result. */
if (write_concern) {
mongoc_bulk_operation_set_write_concern(bulk, write_concern);
} else {
write_concern = mongoc_client_get_write_concern(client);
}
efree(dbname);
efree(collname);
if (server_id > 0) {
mongoc_bulk_operation_set_hint(bulk, server_id);
}
- success = mongoc_bulk_operation_execute(bulk, NULL, &error);
+ success = mongoc_bulk_operation_execute(bulk, &reply, &error);
/* Write succeeded and the user doesn't care for the results */
if (success && !return_value_used) {
+ bson_destroy(&reply);
return true;
}
/* Check for connection related exceptions */
if (EG(exception)) {
+ bson_destroy(&reply);
return false;
}
- writeresult = phongo_writeresult_init(return_value, &bulk->result, client, bulk->hint TSRMLS_CC);
+ writeresult = phongo_writeresult_init(return_value, &reply, client, bulk->hint TSRMLS_CC);
writeresult->write_concern = mongoc_write_concern_copy(write_concern);
/* The Write failed */
if (!success) {
- /* The Command itself failed */
- if (bson_empty0(&writeresult->write_result.writeErrors) && bson_empty0(&writeresult->write_result.writeConcernErrors)) {
- /* FIXME: Maybe we can look at write_result.error and not pass error at all? */
- phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
- } else {
- char *bulk_error_msg;
-
- bulk_error_msg = phongo_assemble_bulk_write_error(&writeresult->write_result);
- phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "%s", bulk_error_msg);
- efree(bulk_error_msg);
+ if (error.domain == MONGOC_ERROR_COMMAND || error.domain == MONGOC_ERROR_WRITE_CONCERN) {
+ phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "%s", error.message);
phongo_add_exception_prop(ZEND_STRL("writeResult"), return_value TSRMLS_CC);
+ } else {
+ phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
}
- return false;
}
- return true;
+
+ bson_destroy(&reply);
+
+ return success;
} /* }}} */
int phongo_execute_query(mongoc_client_t *client, const char *namespace, const php_phongo_query_t *query, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
const bson_t *doc = NULL;
mongoc_cursor_t *cursor;
char *dbname;
char *collname;
mongoc_collection_t *collection;
if (!phongo_split_namespace(namespace, &dbname, &collname)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s: %s", "Invalid namespace provided", namespace);
return false;
}
collection = mongoc_client_get_collection(client, dbname, collname);
efree(dbname);
efree(collname);
if (query->read_concern) {
mongoc_collection_set_read_concern(collection, query->read_concern);
}
cursor = mongoc_collection_find(collection, query->flags, query->skip, query->limit, query->batch_size, query->query, query->selector, read_preference);
mongoc_collection_destroy(collection);
/* mongoc issues a warning we need to catch somehow */
if (!cursor) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "%s", "FIXME: Couldn't create cursor...");
return false;
}
if (server_id > 0) {
cursor->hint = server_id;
}
if (!mongoc_cursor_next(cursor, &doc)) {
bson_error_t error;
/* Check for connection related exceptions */
if (EG(exception)) {
mongoc_cursor_destroy(cursor);
return false;
}
/* Could simply be no docs, which is not an error */
if (mongoc_cursor_error(cursor, &error)) {
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
mongoc_cursor_destroy(cursor);
return false;
}
}
if (!return_value_used) {
mongoc_cursor_destroy(cursor);
return true;
}
phongo_cursor_init(return_value, cursor, client TSRMLS_CC);
return true;
} /* }}} */
int phongo_execute_command(mongoc_client_t *client, const char *db, const bson_t *command, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
mongoc_cursor_t *cursor;
const bson_t *doc;
bson_iter_t iter;
bson_iter_t child;
cursor = mongoc_client_command(client, db, MONGOC_QUERY_NONE, 0, 1, 0, command, NULL, read_preference);
if (server_id > 0) {
cursor->hint = server_id;
}
if (!mongoc_cursor_next(cursor, &doc)) {
bson_error_t error;
/* Check for connection related exceptions */
if (EG(exception)) {
mongoc_cursor_destroy(cursor);
return false;
}
if (mongoc_cursor_error(cursor, &error)) {
mongoc_cursor_destroy(cursor);
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
return false;
}
}
if (!return_value_used) {
mongoc_cursor_destroy(cursor);
return true;
}
/* This code is adapated from _mongoc_cursor_cursorid_prime(), but we avoid
* advancing the cursor, since we are already positioned at the first result
* after the error checking above. */
if (bson_iter_init_find(&iter, doc, "cursor") && BSON_ITER_HOLDS_DOCUMENT(&iter) && bson_iter_recurse(&iter, &child)) {
mongoc_cursor_cursorid_t *cid;
bson_t empty = BSON_INITIALIZER;
_mongoc_cursor_cursorid_init(cursor, &empty);
cursor->limit = 0;
cid = cursor->iface_data;
cid->in_batch = true;
bson_destroy (&empty);
while (bson_iter_next(&child)) {
if (BSON_ITER_IS_KEY(&child, "id")) {
cursor->rpc.reply.cursor_id = bson_iter_as_int64(&child);
} else if (BSON_ITER_IS_KEY(&child, "ns")) {
const char *ns;
ns = bson_iter_utf8(&child, &cursor->nslen);
bson_strncpy(cursor->ns, ns, sizeof cursor->ns);
} else if (BSON_ITER_IS_KEY(&child, "firstBatch")) {
if (BSON_ITER_HOLDS_ARRAY(&child) && bson_iter_recurse(&child, &cid->batch_iter)) {
cid->in_batch = true;
}
}
}
cursor->is_command = false;
/* The cursor's current element is the command's response document.
* Advance once so that the cursor is positioned at the first document
* within the command cursor's result set.
*/
mongoc_cursor_next(cursor, &doc);
}
phongo_cursor_init(return_value, cursor, client TSRMLS_CC);
return true;
} /* }}} */
/* }}} */
/* {{{ Stream vtable */
void phongo_stream_destroy(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
if (base_stream->stream) {
MONGOC_DEBUG("Not destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
} else {
MONGOC_DEBUG("Wrapped stream already destroyed");
}
/*
* DON'T DO ANYTHING TO THE INTERNAL base_stream->stream
* The stream should not be closed during normal dtor -- as we want it to
* survive until next request.
* We only clean it up on failure and (implicitly) MSHUTDOWN
*/
efree(base_stream);
} /* }}} */
void phongo_stream_failed(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
if (base_stream->stream) {
#if PHP_VERSION_ID < 70000
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
#endif
MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
base_stream->stream = NULL;
}
efree(base_stream);
} /* }}} */
int phongo_stream_close(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
MONGOC_DEBUG("Closing RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
if (base_stream->stream) {
#if PHP_VERSION_ID < 70000
TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
#endif
MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
base_stream->stream = NULL;
}
return 0;
} /* }}} */
void php_phongo_set_timeout(php_phongo_stream_socket *base_stream, int32_t timeout_msec) /* {{{ */
{
struct timeval rtimeout = {0, 0};
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
if (timeout_msec > 0) {
rtimeout.tv_sec = timeout_msec / 1000;
rtimeout.tv_usec = (timeout_msec % 1000) * 1000;
}
php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_READ_TIMEOUT, 0, &rtimeout);
MONGOC_DEBUG("Setting timeout to: %d", timeout_msec);
} /* }}} */
/* This is blatantr copy of _mongoc_stream_tls_writev
* https://github.com/mongodb/mongo-c-driver/blob/4ebba3d84286df3867bad89358eb6ae956e62a59/src/mongoc/mongoc-stream-tls.c#L500
*/
ssize_t phongo_stream_writev(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_t iovcnt, int32_t timeout_msec) /* {{{ */
{
char buf[PHONGO_STREAM_BUFFER_SIZE];
ssize_t ret = 0;
ssize_t child_ret;
size_t i;
size_t iov_pos = 0;
/* There's a bit of a dance to coalesce vectorized writes into
* PHONGO_STREAM_BUFFER_SIZE'd writes to avoid lots of small tls
* packets.
*
* The basic idea is that we want to combine writes in the buffer if they're
* smaller than the buffer, flushing as it gets full. For larger writes, or
* the last write in the iovec array, we want to ignore the buffer and just
* write immediately. We take care of doing buffer writes by re-invoking
* ourself with a single iovec_t, pointing at our stack buffer.
*/
char *buf_head = buf;
char *buf_tail = buf;
char *buf_end = buf + PHONGO_STREAM_BUFFER_SIZE;
size_t bytes;
char *to_write = NULL;
size_t to_write_len;
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
php_phongo_set_timeout(base_stream, timeout_msec);
BSON_ASSERT (iov);
BSON_ASSERT (iovcnt);
for (i = 0; i < iovcnt; i++) {
iov_pos = 0;
while (iov_pos < iov[i].iov_len) {
if (buf_head != buf_tail ||
((i + 1 < iovcnt) &&
((buf_end - buf_tail) > (iov[i].iov_len - iov_pos)))) {
/* If we have either of:
* - buffered bytes already
* - another iovec to send after this one and we don't have more
* bytes to send than the size of the buffer.
*
* copy into the buffer */
bytes = BSON_MIN (iov[i].iov_len - iov_pos, buf_end - buf_tail);
memcpy (buf_tail, iov[i].iov_base + iov_pos, bytes);
buf_tail += bytes;
iov_pos += bytes;
if (buf_tail == buf_end) {
/* If we're full, request send */
to_write = buf_head;
to_write_len = buf_tail - buf_head;
buf_tail = buf_head = buf;
}
} else {
/* Didn't buffer, so just write it through */
to_write = (char *)iov[i].iov_base + iov_pos;
to_write_len = iov[i].iov_len - iov_pos;
iov_pos += to_write_len;
}
if (to_write) {
/* We get here if we buffered some bytes and filled the buffer, or
* if we didn't buffer and have to send out of the iovec */
child_ret = php_stream_write(base_stream->stream, to_write, to_write_len);
if (child_ret < 0) {
/* Buffer write failed, just return the error */
return child_ret;
}
ret += child_ret;
if (child_ret < to_write_len) {
/* we timed out, so send back what we could send */
return ret;
}
to_write = NULL;
}
}
}
if (buf_head != buf_tail) {
/* If we have any bytes buffered, send */
child_ret = php_stream_write(base_stream->stream, buf_head, buf_tail - buf_head);
if (child_ret < 0) {
return child_ret;
}
ret += child_ret;
}
return ret;
} /* }}} */
ssize_t phongo_stream_readv(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_t iovcnt, size_t min_bytes, int32_t timeout_msec) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
ssize_t ret = 0;
ssize_t read;
size_t cur = 0;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
php_phongo_set_timeout(base_stream, timeout_msec);
do {
read = php_stream_read(base_stream->stream, iov[cur].iov_base, iov[cur].iov_len);
MONGOC_DEBUG("Reading got: %zd wanted: %zd", read, min_bytes);
if (read <= 0) {
if (ret >= (ssize_t)min_bytes) {
break;
}
return -1;
}
ret += read;
while ((cur < iovcnt) && (read >= (ssize_t)iov[cur].iov_len)) {
read -= iov[cur++].iov_len;
}
if (cur == iovcnt) {
break;
}
if (ret >= (ssize_t)min_bytes) {
break;
}
iov[cur].iov_base = ((char *)iov[cur].iov_base) + read;
iov[cur].iov_len -= read;
} while(1);
return ret;
} /* }}} */
int phongo_stream_setsockopt(mongoc_stream_t *stream, int level, int optname, void *optval, socklen_t optlen) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
int socket = ((php_netstream_data_t *)base_stream->stream->abstract)->socket;
return setsockopt (socket, level, optname, optval, optlen);
} /* }}} */
bool phongo_stream_socket_check_closed(mongoc_stream_t *stream) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
return PHP_STREAM_OPTION_RETURN_OK != php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL);
} /* }}} */
ssize_t phongo_stream_poll (mongoc_stream_poll_t *streams, size_t nstreams, int32_t timeout) /* {{{ */
{
php_pollfd *fds = NULL;
size_t i;
ssize_t rval = -1;
TSRMLS_FETCH();
fds = emalloc(sizeof(*fds) * nstreams);
for (i = 0; i < nstreams; i++) {
php_socket_t this_fd;
if (php_stream_cast(((php_phongo_stream_socket *)streams[i].stream)->stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 0) == SUCCESS && this_fd >= 0) {
fds[i].fd = this_fd;
fds[i].events = streams[i].events;
fds[i].revents = 0;
}
}
rval = php_poll2(fds, nstreams, timeout);
if (rval > 0) {
for (i = 0; i < nstreams; i++) {
streams[i].revents = fds[i].revents;
}
}
efree(fds);
return rval;
} /* }}} */
#if PHP_VERSION_ID < 50600
int php_mongo_verify_hostname(const char *hostname, X509 *cert TSRMLS_DC)
{
if (php_mongo_matches_san_list(cert, hostname) == SUCCESS) {
return SUCCESS;
}
if (php_mongo_matches_common_name(cert, hostname TSRMLS_CC) == SUCCESS) {
return SUCCESS;
}
return FAILURE;
}
int php_phongo_peer_verify(php_stream *stream, X509 *cert, const char *hostname, bson_error_t *error TSRMLS_DC)
{
zval **verify_peer_name;
/* This option is available since PHP 5.6.0 */
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_peer_name", &verify_peer_name) == SUCCESS && zend_is_true(*verify_peer_name)) {
zval **zhost = NULL;
const char *peer;
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name", &zhost) == SUCCESS) {
convert_to_string_ex(zhost);
peer = Z_STRVAL_PP(zhost);
} else {
peer = hostname;
}
if (php_mongo_verify_hostname(peer, cert TSRMLS_CC) == FAILURE) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Remote certificate SubjectAltName or CN does not match '%s'", hostname);
return false;
}
}
return true;
}
#endif
bool php_phongo_ssl_verify(php_stream *stream, const char *hostname, bson_error_t *error TSRMLS_DC)
{
#if PHP_VERSION_ID >= 70000
zval *zcert;
zval *verify_expiry;
#else
zval **zcert;
zval **verify_expiry;
#endif
X509 *cert;
if (!PHP_STREAM_CONTEXT(stream)) {
return true;
}
#if PHP_VERSION_ID >= 70000
if (!((zcert = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_certificate")) != NULL && Z_TYPE_P(zcert) == IS_RESOURCE)) {
#else
if (!(php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_certificate", &zcert) == SUCCESS && Z_TYPE_PP(zcert) == IS_RESOURCE)) {
#endif
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Could not capture certificate of %s", hostname);
return false;
}
#if PHP_VERSION_ID >= 70000
cert = (X509 *)x509_from_zval(zcert TSRMLS_CC);
#else
cert = (X509 *)x509_from_zval(*zcert TSRMLS_CC);
#endif
if (!cert) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Could not get certificate of %s", hostname);
return false;
}
#if PHP_VERSION_ID < 50600
if (!php_phongo_peer_verify(stream, cert, hostname, error TSRMLS_CC)) {
return false;
}
#endif
#if PHP_VERSION_ID >= 70000
if ((verify_expiry = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_expiry")) != NULL && zend_is_true(verify_expiry)) {
#else
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_expiry", &verify_expiry) == SUCCESS && zend_is_true(*verify_expiry)) {
#endif
time_t current = time(NULL);
time_t valid_from = php_mongo_asn1_time_to_time_t(X509_get_notBefore(cert) TSRMLS_CC);
time_t valid_until = php_mongo_asn1_time_to_time_t(X509_get_notAfter(cert) TSRMLS_CC);
if (valid_from > current) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Certificate is not valid yet on %s", hostname);
return false;
}
if (current > valid_until) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Certificate has expired on %s", hostname);
return false;
}
}
return true;
}
mongoc_stream_t* phongo_stream_initiator(const mongoc_uri_t *uri, const mongoc_host_list_t *host, void *user_data, bson_error_t *error) /* {{{ */
{
zend_error_handling error_handling;
php_phongo_stream_socket *base_stream = NULL;
php_stream *stream = NULL;
const bson_t *options;
bson_iter_t iter;
struct timeval timeout = {0, 0};
struct timeval *timeoutp = NULL;
char *uniqid;
phongo_char *errmsg = NULL;
int errcode;
char *dsn;
int dsn_len;
TSRMLS_FETCH();
ENTRY;
switch (host->family) {
#if defined(AF_INET6)
case AF_INET6:
dsn_len = spprintf(&dsn, 0, "tcp://[%s]:%d", host->host, host->port);
break;
#endif
case AF_INET:
dsn_len = spprintf(&dsn, 0, "tcp://%s:%d", host->host, host->port);
break;
case AF_UNIX:
dsn_len = spprintf(&dsn, 0, "unix://%s", host->host);
break;
default:
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Invalid address family: 0x%02x", host->family);
RETURN(NULL);
}
options = mongoc_uri_get_options(uri);
- if (bson_iter_init_find (&iter, options, "connecttimeoutms") && BSON_ITER_HOLDS_INT32 (&iter)) {
+ if (bson_iter_init_find_case (&iter, options, "connecttimeoutms") && BSON_ITER_HOLDS_INT32 (&iter)) {
int32_t connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
if (!(connecttimeoutms = bson_iter_int32(&iter))) {
connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
}
timeout.tv_sec = connecttimeoutms / 1000;
timeout.tv_usec = (connecttimeoutms % 1000) * 1000;
timeoutp = &timeout;
+ MONGOC_DEBUG("Applying connectTimeoutMS: %d", connecttimeoutms);
}
spprintf(&uniqid, 0, "%s:%d[%s]", host->host, host->port, mongoc_uri_get_string(uri));
MONGOC_DEBUG("Connecting to '%s'", uniqid);
zend_replace_error_handling(EH_SUPPRESS, NULL, &error_handling TSRMLS_CC);
stream = php_stream_xport_create(dsn, dsn_len, 0, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, uniqid, timeoutp, (php_stream_context *)user_data, &errmsg, &errcode);
zend_restore_error_handling(&error_handling TSRMLS_CC);
if (!stream) {
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Failed connecting to '%s:%d': %s", host->host, host->port, phongo_str(errmsg));
efree(dsn);
efree(uniqid);
if (errmsg) {
phongo_char_free(errmsg);
}
RETURN(NULL);
}
php_stream_auto_cleanup(stream);
MONGOC_DEBUG("Created: RSRC#%d as '%s'", PHONGO_STREAM_ID(stream), uniqid);
efree(uniqid);
if (mongoc_uri_get_ssl(uri)) {
zend_replace_error_handling(EH_THROW, php_phongo_sslconnectionexception_ce, &error_handling TSRMLS_CC);
MONGOC_DEBUG("Enabling SSL");
/* Capture the server certificate so we can do further verification */
if (PHP_STREAM_CONTEXT(stream)) {
zval capture;
ZVAL_BOOL(&capture, 1);
php_stream_context_set_option(PHP_STREAM_CONTEXT(stream), "ssl", "capture_peer_cert", &capture);
}
if (php_stream_xport_crypto_setup(stream, PHONGO_CRYPTO_METHOD, NULL TSRMLS_CC) < 0) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Failed to setup crypto, is the OpenSSL extension loaded?");
efree(dsn);
return NULL;
}
if (php_stream_xport_crypto_enable(stream, 1 TSRMLS_CC) < 0) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Failed to setup crypto, is the server running with SSL?");
efree(dsn);
return NULL;
}
if (!php_phongo_ssl_verify(stream, host->host, error TSRMLS_CC)) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_pclose(stream);
efree(dsn);
return NULL;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
efree(dsn);
/* We only need the context really for SSL initialization, safe to remove now */
php_stream_context_set(stream, NULL);
base_stream = ecalloc(1, sizeof(php_phongo_stream_socket));
base_stream->stream = stream;
base_stream->uri = uri;
base_stream->host = host;
TSRMLS_SET_CTX(base_stream->tsrm_ls);
/* flush missing, doesn't seem to be used */
base_stream->vtable.type = 100;
base_stream->vtable.destroy = phongo_stream_destroy;
base_stream->vtable.failed = phongo_stream_failed;
base_stream->vtable.close = phongo_stream_close;
base_stream->vtable.writev = phongo_stream_writev;
base_stream->vtable.readv = phongo_stream_readv;
base_stream->vtable.setsockopt = phongo_stream_setsockopt;
base_stream->vtable.check_closed = phongo_stream_socket_check_closed;
base_stream->vtable.poll = phongo_stream_poll;
if (host->family != AF_UNIX) {
int flag = 1;
if (phongo_stream_setsockopt((mongoc_stream_t *)base_stream, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(int))) {
MONGOC_WARNING("setsockopt TCP_NODELAY failed");
}
}
RETURN((mongoc_stream_t *)base_stream);
} /* }}} */
/* }}} */
/* {{{ mongoc types from from_zval */
const mongoc_write_concern_t* phongo_write_concern_from_zval(zval *zwrite_concern TSRMLS_DC) /* {{{ */
{
if (zwrite_concern) {
php_phongo_writeconcern_t *intern = Z_WRITECONCERN_OBJ_P(zwrite_concern);
if (intern) {
return intern->write_concern;
}
}
return NULL;
} /* }}} */
const mongoc_read_concern_t* phongo_read_concern_from_zval(zval *zread_concern TSRMLS_DC) /* {{{ */
{
if (zread_concern) {
php_phongo_readconcern_t *intern = Z_READCONCERN_OBJ_P(zread_concern);
if (intern) {
return intern->read_concern;
}
}
return NULL;
} /* }}} */
const mongoc_read_prefs_t* phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC) /* {{{ */
{
if (zread_preference) {
php_phongo_readpreference_t *intern = Z_READPREFERENCE_OBJ_P(zread_preference);
if (intern) {
return intern->read_preference;
}
}
return NULL;
} /* }}} */
const php_phongo_query_t* phongo_query_from_zval(zval *zquery TSRMLS_DC) /* {{{ */
{
php_phongo_query_t *intern = Z_QUERY_OBJ_P(zquery);
return intern;
} /* }}} */
/* }}} */
/* {{{ phongo zval from mongoc types */
void php_phongo_cursor_id_new_from_id(zval *object, int64_t cursorid TSRMLS_DC) /* {{{ */
{
php_phongo_cursorid_t *intern;
object_init_ex(object, php_phongo_cursorid_ce);
intern = Z_CURSORID_OBJ_P(object);
intern->id = cursorid;
} /* }}} */
void php_phongo_objectid_new_from_oid(zval *object, const bson_oid_t *oid TSRMLS_DC) /* {{{ */
{
php_phongo_objectid_t *intern;
object_init_ex(object, php_phongo_objectid_ce);
intern = Z_OBJECTID_OBJ_P(object);
bson_oid_to_string(oid, intern->oid);
} /* }}} */
void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *sd) /* {{{ */
{
array_init(retval);
ADD_ASSOC_STRING(retval, "host", (char *)sd->host.host);
ADD_ASSOC_LONG_EX(retval, "port", sd->host.port);
ADD_ASSOC_LONG_EX(retval, "type", sd->type);
ADD_ASSOC_BOOL_EX(retval, "is_primary", sd->type == MONGOC_SERVER_RS_PRIMARY);
ADD_ASSOC_BOOL_EX(retval, "is_secondary", sd->type == MONGOC_SERVER_RS_SECONDARY);
ADD_ASSOC_BOOL_EX(retval, "is_arbiter", sd->type == MONGOC_SERVER_RS_ARBITER);
{
bson_iter_t iter;
zend_bool b = bson_iter_init_find_case(&iter, &sd->last_is_master, "hidden") && bson_iter_as_bool(&iter);
ADD_ASSOC_BOOL_EX(retval, "is_hidden", b);
}
{
bson_iter_t iter;
zend_bool b = bson_iter_init_find_case(&iter, &sd->last_is_master, "passive") && bson_iter_as_bool(&iter);
ADD_ASSOC_BOOL_EX(retval, "is_passive", b);
}
if (sd->tags.len) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
phongo_bson_to_zval_ex(bson_get_data(&sd->tags), sd->tags.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "tags", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "tags", state.zchild);
#endif
}
{
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
phongo_bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "last_is_master", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "last_is_master", state.zchild);
#endif
}
ADD_ASSOC_LONG_EX(retval, "round_trip_time", sd->round_trip_time);
} /* }}} */
void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern) /* {{{ */
{
const char *level = mongoc_read_concern_get_level(read_concern);
array_init_size(retval, 1);
if (level) {
ADD_ASSOC_STRING(retval, "level", (char *)level);
} else {
ADD_ASSOC_NULL_EX(retval, "level");
}
} /* }}} */
void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs) /* {{{ */
{
array_init_size(retval, 2);
ADD_ASSOC_LONG_EX(retval, "mode", read_prefs->mode);
if (read_prefs->tags.len) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
phongo_bson_to_zval_ex(bson_get_data(&read_prefs->tags), read_prefs->tags.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "tags", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "tags", state.zchild);
#endif
} else {
ADD_ASSOC_NULL_EX(retval, "tags");
}
} /* }}} */
void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern) /* {{{ */
{
const char *wtag = mongoc_write_concern_get_wtag(write_concern);
const int32_t w = mongoc_write_concern_get_w(write_concern);
array_init_size(retval, 4);
if (wtag) {
ADD_ASSOC_STRING(retval, "w", (char *)wtag);
} else if (mongoc_write_concern_get_wmajority(write_concern)) {
ADD_ASSOC_STRING(retval, "w", (char *)PHONGO_WRITE_CONCERN_W_MAJORITY);
} else if (w != MONGOC_WRITE_CONCERN_W_DEFAULT) {
ADD_ASSOC_LONG_EX(retval, "w", w);
} else {
ADD_ASSOC_NULL_EX(retval, "w");
}
ADD_ASSOC_BOOL_EX(retval, "wmajority", mongoc_write_concern_get_wmajority(write_concern));
ADD_ASSOC_LONG_EX(retval, "wtimeout", mongoc_write_concern_get_wtimeout(write_concern));
if (write_concern->journal != MONGOC_WRITE_CONCERN_JOURNAL_DEFAULT) {
ADD_ASSOC_BOOL_EX(retval, "journal", mongoc_write_concern_get_journal(write_concern));
} else {
ADD_ASSOC_NULL_EX(retval, "journal");
}
} /* }}} */
void php_phongo_cursor_to_zval(zval *retval, const mongoc_cursor_t *cursor) /* {{{ */
{
array_init_size(retval, 19);
ADD_ASSOC_LONG_EX(retval, "stamp", cursor->stamp);
#define _ADD_BOOL(z, field) ADD_ASSOC_BOOL_EX(z, #field, cursor->field)
_ADD_BOOL(retval, is_command);
_ADD_BOOL(retval, sent);
_ADD_BOOL(retval, done);
_ADD_BOOL(retval, end_of_event);
_ADD_BOOL(retval, in_exhaust);
_ADD_BOOL(retval, has_fields);
#undef _ADD_BOOL
/* Avoid using PHONGO_TYPEMAP_NATIVE_ARRAY for decoding query, selector,
* and current documents so that users can differentiate BSON arrays
* and documents. */
{
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
phongo_bson_to_zval(bson_get_data(&cursor->query), cursor->query.len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "query", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "query", zv);
#endif
}
{
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
phongo_bson_to_zval(bson_get_data(&cursor->fields), cursor->fields.len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "fields", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "fields", zv);
#endif
}
{
#if PHP_VERSION_ID >= 70000
zval read_preference;
php_phongo_read_preference_to_zval(&read_preference, cursor->read_prefs);
ADD_ASSOC_ZVAL_EX(retval, "read_preference", &read_preference);
#else
zval *read_preference = NULL;
MAKE_STD_ZVAL(read_preference);
php_phongo_read_preference_to_zval(read_preference, cursor->read_prefs);
ADD_ASSOC_ZVAL_EX(retval, "read_preference", read_preference);
#endif
}
#define _ADD_INT(z, field) ADD_ASSOC_LONG_EX(z, #field, cursor->field)
_ADD_INT(retval, flags);
_ADD_INT(retval, skip);
_ADD_INT(retval, limit);
_ADD_INT(retval, count);
_ADD_INT(retval, batch_size);
#undef _ADD_INT
ADD_ASSOC_STRING(retval, "ns", (char *)cursor->ns);
if (cursor->current) {
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
phongo_bson_to_zval(bson_get_data(cursor->current), cursor->current->len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "current_doc", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "current_doc", zv);
#endif
}
} /* }}} */
/* }}} */
static mongoc_uri_t *php_phongo_make_uri(const char *uri_string, bson_t *options) /* {{{ */
{
bson_iter_t iter;
mongoc_uri_t *uri;
uri = mongoc_uri_new(uri_string);
MONGOC_DEBUG("Connection string: '%s'", uri_string);
if (!uri) {
return NULL;
}
if (options && bson_iter_init(&iter, options)) {
while (bson_iter_next (&iter)) {
const char *key = bson_iter_key(&iter);
/* Skip read preference and write concern options, as those must be
* processed after the mongoc_client_t is constructed. */
if (!strcasecmp(key, "journal") ||
!strcasecmp(key, "readpreference") ||
!strcasecmp(key, "readpreferencetags") ||
!strcasecmp(key, "safe") ||
!strcasecmp(key, "slaveok") ||
!strcasecmp(key, "w") ||
!strcasecmp(key, "wtimeoutms")) {
continue;
}
if (mongoc_uri_option_is_bool(key)) {
mongoc_uri_set_option_as_bool (uri, key, bson_iter_as_bool(&iter));
}
else if (mongoc_uri_option_is_int32(key) && BSON_ITER_HOLDS_INT32(&iter)) {
mongoc_uri_set_option_as_int32 (uri, key, bson_iter_int32 (&iter));
}
else if (mongoc_uri_option_is_utf8(key) && BSON_ITER_HOLDS_UTF8(&iter)) {
mongoc_uri_set_option_as_utf8(uri, key, bson_iter_utf8 (&iter, NULL));
}
else if (BSON_ITER_HOLDS_UTF8(&iter)) {
const char *value = bson_iter_utf8 (&iter, NULL);
if (!strcasecmp(key, "username")) {
mongoc_uri_set_username(uri, value);
} else if (!strcasecmp(key, "password")) {
mongoc_uri_set_password(uri, value);
} else if (!strcasecmp(key, "database")) {
mongoc_uri_set_database(uri, value);
} else if (!strcasecmp(key, "authsource")) {
mongoc_uri_set_auth_source(uri, value);
}
}
}
}
return uri;
} /* }}} */
void php_phongo_populate_default_ssl_ctx(php_stream_context *ctx, zval *driverOptions) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *tmp;
#define SET_STRING_CTX(name) \
if (driverOptions && php_array_exists(driverOptions, name)) { \
zval ztmp; \
zend_bool ctmp_free; \
int ctmp_len; \
char *ctmp; \
ctmp = php_array_fetchl_string(driverOptions, name, sizeof(name)-1, &ctmp_len, &ctmp_free); \
ZVAL_STRING(&ztmp, ctmp); \
if (ctmp_free) { \
str_efree(ctmp); \
} \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
zval_ptr_dtor(&ztmp); \
}
#define SET_BOOL_CTX(name, defaultvalue) \
{ \
zval ztmp; \
if (driverOptions && php_array_exists(driverOptions, name)) { \
ZVAL_BOOL(&ztmp, php_array_fetchl_bool(driverOptions, ZEND_STRL(name))); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
else if ((tmp = php_stream_context_get_option(ctx, "ssl", name)) == NULL) { \
ZVAL_BOOL(&ztmp, defaultvalue); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
}
#else
zval **tmp;
#define SET_STRING_CTX(name) \
if (driverOptions && php_array_exists(driverOptions, name)) { \
zval ztmp; \
zend_bool ctmp_free; \
int ctmp_len; \
char *ctmp; \
ctmp = php_array_fetchl_string(driverOptions, name, sizeof(name)-1, &ctmp_len, &ctmp_free); \
ZVAL_STRING(&ztmp, ctmp, ctmp_free); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
}
#define SET_BOOL_CTX(name, defaultvalue) \
{ \
zval ztmp; \
if (driverOptions && php_array_exists(driverOptions, name)) { \
ZVAL_BOOL(&ztmp, php_array_fetchl_bool(driverOptions, ZEND_STRL(name))); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
else if (php_stream_context_get_option(ctx, "ssl", name, &tmp) == FAILURE) { \
ZVAL_BOOL(&ztmp, defaultvalue); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
}
#endif
SET_BOOL_CTX("verify_peer", 1);
SET_BOOL_CTX("verify_peer_name", 1);
SET_BOOL_CTX("verify_hostname", 1);
SET_BOOL_CTX("verify_expiry", 1);
SET_BOOL_CTX("allow_self_signed", 0);
SET_STRING_CTX("peer_name");
SET_STRING_CTX("local_pk");
SET_STRING_CTX("local_cert");
SET_STRING_CTX("cafile");
SET_STRING_CTX("capath");
SET_STRING_CTX("passphrase");
SET_STRING_CTX("ciphers");
#undef SET_BOOL_CTX
#undef SET_STRING_CTX
} /* }}} */
static bool php_phongo_apply_rc_options_to_client(mongoc_client_t *client, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
mongoc_read_concern_t *new_rc;
const mongoc_read_concern_t *old_rc;
if (!(old_rc = mongoc_client_get_read_concern(client))) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "Client does not have a read concern");
return false;
}
/* Return early if there are no options to apply */
if (bson_empty0(options)) {
return true;
}
if (!bson_iter_init_find_case(&iter, options, "readconcernlevel")) {
return true;
}
new_rc = mongoc_read_concern_copy(old_rc);
if (bson_iter_init_find_case(&iter, options, "readconcernlevel") && BSON_ITER_HOLDS_UTF8(&iter)) {
const char *str = bson_iter_utf8(&iter, NULL);
mongoc_read_concern_set_level(new_rc, str);
}
mongoc_client_set_read_concern(client, new_rc);
mongoc_read_concern_destroy(new_rc);
return true;
} /* }}} */
static bool php_phongo_apply_rp_options_to_client(mongoc_client_t *client, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
mongoc_read_prefs_t *new_rp;
const mongoc_read_prefs_t *old_rp;
if (!(old_rp = mongoc_client_get_read_prefs(client))) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "Client does not have a read preference");
return false;
}
/* Return early if there are no options to apply */
if (bson_empty0(options)) {
return true;
}
if (!bson_iter_init_find_case(&iter, options, "slaveok") &&
!bson_iter_init_find_case(&iter, options, "readpreference") &&
!bson_iter_init_find_case(&iter, options, "readpreferencetags")) {
return true;
}
new_rp = mongoc_read_prefs_copy(old_rp);
if (bson_iter_init_find_case(&iter, options, "slaveok") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
}
if (bson_iter_init_find_case(&iter, options, "readpreference") && BSON_ITER_HOLDS_UTF8(&iter)) {
const char *str = bson_iter_utf8(&iter, NULL);
if (0 == strcasecmp("primary", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY);
} else if (0 == strcasecmp("primarypreferred", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY_PREFERRED);
} else if (0 == strcasecmp("secondary", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY);
} else if (0 == strcasecmp("secondarypreferred", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
} else if (0 == strcasecmp("nearest", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_NEAREST);
} else {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported readPreference value: '%s'", str);
mongoc_read_prefs_destroy(new_rp);
return false;
}
}
if (bson_iter_init_find_case(&iter, options, "readpreferencetags") && BSON_ITER_HOLDS_ARRAY(&iter)) {
bson_t tags;
uint32_t len;
const uint8_t *data;
bson_iter_array(&iter, &len, &data);
if (bson_init_static(&tags, data, len)) {
mongoc_read_prefs_set_tags(new_rp, &tags);
}
}
if (mongoc_read_prefs_get_mode(new_rp) == MONGOC_READ_PRIMARY &&
!bson_empty(mongoc_read_prefs_get_tags(new_rp))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Primary read preference mode conflicts with tags");
mongoc_read_prefs_destroy(new_rp);
return false;
}
/* This may be redundant in light of the last check (primary with tags), but
* we'll check anyway in case additional validation is implemented. */
if (!mongoc_read_prefs_is_valid(new_rp)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Read preference is not valid");
mongoc_read_prefs_destroy(new_rp);
return false;
}
mongoc_client_set_read_prefs(client, new_rp);
mongoc_read_prefs_destroy(new_rp);
return true;
} /* }}} */
static bool php_phongo_apply_wc_options_to_client(mongoc_client_t *client, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
int32_t wtimeoutms;
mongoc_write_concern_t *new_wc;
const mongoc_write_concern_t *old_wc;
if (!(old_wc = mongoc_client_get_write_concern(client))) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "Client does not have a write concern");
return false;
}
/* Return early if there are no options to apply */
if (bson_empty0(options)) {
return true;
}
if (!bson_iter_init_find_case(&iter, options, "journal") &&
!bson_iter_init_find_case(&iter, options, "safe") &&
!bson_iter_init_find_case(&iter, options, "w") &&
!bson_iter_init_find_case(&iter, options, "wtimeoutms")) {
return true;
}
wtimeoutms = mongoc_write_concern_get_wtimeout(old_wc);
new_wc = mongoc_write_concern_copy(old_wc);
if (bson_iter_init_find_case(&iter, options, "safe") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_write_concern_set_w(new_wc, bson_iter_bool(&iter) ? 1 : MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED);
}
if (bson_iter_init_find_case(&iter, options, "wtimeoutms") && BSON_ITER_HOLDS_INT32(&iter)) {
wtimeoutms = bson_iter_int32(&iter);
}
if (bson_iter_init_find_case(&iter, options, "journal") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_write_concern_set_journal(new_wc, bson_iter_bool(&iter));
}
if (bson_iter_init_find_case(&iter, options, "w")) {
if (BSON_ITER_HOLDS_INT32(&iter)) {
int32_t value = bson_iter_int32(&iter);
switch (value) {
case MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED:
case MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED:
mongoc_write_concern_set_w(new_wc, value);
break;
default:
if (value > 0) {
mongoc_write_concern_set_w(new_wc, value);
break;
}
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported w value: %d", value);
mongoc_write_concern_destroy(new_wc);
return false;
}
} else if (BSON_ITER_HOLDS_UTF8(&iter)) {
const char *str = bson_iter_utf8(&iter, NULL);
if (0 == strcasecmp(PHONGO_WRITE_CONCERN_W_MAJORITY, str)) {
mongoc_write_concern_set_wmajority(new_wc, wtimeoutms);
} else {
mongoc_write_concern_set_wtag(new_wc, str);
}
}
}
/* Only set wtimeout if it's still applicable; otherwise, clear it. */
if (mongoc_write_concern_get_w(new_wc) > 1 ||
mongoc_write_concern_get_wmajority(new_wc) ||
mongoc_write_concern_get_wtag(new_wc)) {
mongoc_write_concern_set_wtimeout(new_wc, wtimeoutms);
} else {
mongoc_write_concern_set_wtimeout(new_wc, 0);
}
if (mongoc_write_concern_get_journal(new_wc)) {
int32_t w = mongoc_write_concern_get_w(new_wc);
if (w == MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED || w == MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Journal conflicts with w value: %d", w);
mongoc_write_concern_destroy(new_wc);
return false;
}
}
/* This may be redundant in light of the last check (unacknowledged w with
journal), but we'll check anyway in case additional validation is
implemented. */
if (!_mongoc_write_concern_is_valid(new_wc)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Write concern is not valid");
mongoc_write_concern_destroy(new_wc);
return false;
}
mongoc_client_set_write_concern(client, new_wc);
mongoc_write_concern_destroy(new_wc);
return true;
} /* }}} */
static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *tmp;
#else
zval **tmp;
#endif
php_stream_context *ctx = NULL;
const char *mech, *mongoc_version, *bson_version;
mongoc_client_t *client;
ENTRY;
#if PHP_VERSION_ID >= 70000
if (driverOptions && (tmp = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "debug", sizeof("debug")-1)) != NULL) {
zend_string *key = zend_string_init(PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI)-1, 0);
zend_string *value_str = zval_get_string(tmp);
zend_alter_ini_entry_ex(key, value_str, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0);
zend_string_release(key);
zend_string_release(value_str);
}
#else
if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "debug", strlen("debug") + 1, (void**)&tmp) == SUCCESS) {
convert_to_string(*tmp);
zend_alter_ini_entry_ex((char *)PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI), Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
#endif
#if PHP_VERSION_ID >= 70000
if (driverOptions && (tmp = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "context", sizeof("context")-1)) != NULL) {
ctx = php_stream_context_from_zval(tmp, 0);
#else
if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "context", strlen("context") + 1, (void**)&tmp) == SUCCESS) {
ctx = php_stream_context_from_zval(*tmp, 0);
#endif
} else {
GET_DEFAULT_CONTEXT();
}
if (mongoc_uri_get_ssl(uri)) {
php_phongo_populate_default_ssl_ctx(ctx, driverOptions);
}
#ifdef HAVE_SYSTEM_LIBMONGOC
mongoc_version = mongoc_get_version();
#else
mongoc_version = "bundled";
#endif
#ifdef HAVE_SYSTEM_LIBBSON
bson_version = bson_get_version();
#else
bson_version = "bundled";
#endif
MONGOC_DEBUG("Creating Manager, phongo-%s[%s] - mongoc-%s(%s), libbson-%s(%s), php-%s",
MONGODB_VERSION_S,
MONGODB_STABILITY_S,
MONGOC_VERSION_S,
mongoc_version,
BSON_VERSION_S,
bson_version,
PHP_VERSION
);
client = mongoc_client_new_from_uri(uri);
if (!client) {
RETURN(NULL);
}
mech = mongoc_uri_get_auth_mechanism(uri);
/* Check if we are doing X509 auth, in which case extract the username (subject) from the cert if no username is provided */
if (mech && !strcasecmp(mech, "MONGODB-X509") && !mongoc_uri_get_username(uri)) {
#if PHP_VERSION_ID >= 70000
zval *pem;
#else
zval **pem;
#endif
#if PHP_VERSION_ID >= 70000
if ((pem = php_stream_context_get_option(ctx, "ssl", "local_cert")) != NULL) {
#else
if (SUCCESS == php_stream_context_get_option(ctx, "ssl", "local_cert", &pem)) {
#endif
char filename[MAXPATHLEN];
#if PHP_VERSION_ID >= 70000
zend_string *s = zval_get_string(pem);
if (VCWD_REALPATH(ZSTR_VAL(s), filename)) {
#else
convert_to_string_ex(pem);
if (VCWD_REALPATH(Z_STRVAL_PP(pem), filename)) {
#endif
mongoc_ssl_opt_t ssl_options;
ssl_options.pem_file = filename;
mongoc_client_set_ssl_opts(client, &ssl_options);
}
#if PHP_VERSION_ID >= 70000
zend_string_release(s);
#endif
}
}
mongoc_client_set_stream_initiator(client, phongo_stream_initiator, ctx);
RETURN(client);
} /* }}} */
bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC) /* {{{ */
{
mongoc_uri_t *uri;
if (!(uri = php_phongo_make_uri(uri_string, bson_options))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Failed to parse MongoDB URI: '%s'", uri_string);
return false;
}
manager->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
mongoc_uri_destroy(uri);
if (!manager->client) {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to create Manager from URI: '%s'", uri_string);
return false;
}
if (!php_phongo_apply_rc_options_to_client(manager->client, bson_options TSRMLS_CC) ||
!php_phongo_apply_rp_options_to_client(manager->client, bson_options TSRMLS_CC) ||
!php_phongo_apply_wc_options_to_client(manager->client, bson_options TSRMLS_CC)) {
/* Exception should already have been thrown */
return false;
}
return true;
} /* }}} */
void php_phongo_new_utcdatetime_from_epoch(zval *object, int64_t msec_since_epoch TSRMLS_DC) /* {{{ */
{
php_phongo_utcdatetime_t *intern;
object_init_ex(object, php_phongo_utcdatetime_ce);
intern = Z_UTCDATETIME_OBJ_P(object);
intern->milliseconds = msec_since_epoch;
} /* }}} */
void php_phongo_new_datetime_from_utcdatetime(zval *object, int64_t milliseconds TSRMLS_DC) /* {{{ */
{
php_date_obj *datetime_obj;
char *sec;
int sec_len;
object_init_ex(object, php_date_get_date_ce());
#ifdef WIN32
sec_len = spprintf(&sec, 0, "@%I64d", (int64_t) milliseconds / 1000);
#else
sec_len = spprintf(&sec, 0, "@%lld", (long long int) milliseconds / 1000);
#endif
datetime_obj = Z_PHPDATE_P(object);
php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0 TSRMLS_CC);
efree(sec);
datetime_obj->time->f = milliseconds % 1000;
} /* }}} */
void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, uint32_t increment, uint32_t timestamp TSRMLS_DC) /* {{{ */
{
php_phongo_timestamp_t *intern;
object_init_ex(object, php_phongo_timestamp_ce);
intern = Z_TIMESTAMP_OBJ_P(object);
intern->increment = increment;
intern->timestamp = timestamp;
} /* }}} */
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC) /* {{{ */
{
php_phongo_new_javascript_from_javascript_and_scope(init, object, code, code_len, NULL TSRMLS_CC);
} /* }}} */
void php_phongo_new_javascript_from_javascript_and_scope(int init, zval *object, const char *code, size_t code_len, const bson_t *scope TSRMLS_DC) /* {{{ */
{
php_phongo_javascript_t *intern;
if (init) {
object_init_ex(object, php_phongo_javascript_ce);
}
intern = Z_JAVASCRIPT_OBJ_P(object);
intern->javascript = estrndup(code, code_len);
intern->javascript_len = code_len;
intern->document = scope ? bson_copy(scope) : NULL;
} /* }}} */
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC) /* {{{ */
{
php_phongo_binary_t *intern;
object_init_ex(object, php_phongo_binary_ce);
intern = Z_BINARY_OBJ_P(object);
intern->data = estrndup(data, data_len);
intern->data_len = data_len;
intern->type = (uint8_t) type;
} /* }}} */
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC) /* {{{ */
{
php_phongo_regex_t *intern;
object_init_ex(object, php_phongo_regex_ce);
intern = Z_REGEX_OBJ_P(object);
intern->pattern_len = strlen(pattern);
intern->pattern = estrndup(pattern, intern->pattern_len);
intern->flags_len = strlen(flags);
intern->flags = estrndup(flags, intern->flags_len);
} /* }}} */
static void php_phongo_cursor_free_current(php_phongo_cursor_t *cursor) /* {{{ */
{
if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
zval_ptr_dtor(&cursor->visitor_data.zchild);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&cursor->visitor_data.zchild);
#else
cursor->visitor_data.zchild = NULL;
#endif
}
} /* }}} */
void php_phongo_cursor_free(php_phongo_cursor_t *cursor) /* {{{ */
{
if (cursor->cursor) {
mongoc_cursor_destroy(cursor->cursor);
cursor->cursor = NULL;
}
php_phongo_cursor_free_current(cursor);
} /* }}} */
/* {{{ Iterator */
static void php_phongo_cursor_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
if (!Z_ISUNDEF(cursor_it->intern.data)) {
#if PHP_VERSION_ID >= 70000
zval_ptr_dtor(&cursor_it->intern.data);
#else
zval_ptr_dtor((zval**)&cursor_it->intern.data);
cursor_it->intern.data = NULL;
#endif
}
#if PHP_VERSION_ID < 70000
efree(cursor_it);
#endif
} /* }}} */
static int php_phongo_cursor_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
return SUCCESS;
}
return FAILURE;
} /* }}} */
#if PHP_VERSION_ID < 50500
static int php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */
{
*int_key = (ulong) ((php_phongo_cursor_iterator *)iter)->current;
return HASH_KEY_IS_LONG;
} /* }}} */
#else
static void php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) /* {{{ */
{
ZVAL_LONG(key, ((php_phongo_cursor_iterator *)iter)->current);
} /* }}} */
#endif
#if PHP_VERSION_ID < 70000
static void php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
*data = &cursor->visitor_data.zchild;
} /* }}} */
#else
static zval* php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
return &cursor->visitor_data.zchild;
} /* }}} */
#endif
static void php_phongo_cursor_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
php_phongo_cursor_t *cursor = cursor_it->cursor;
const bson_t *doc;
php_phongo_cursor_free_current(cursor);
cursor_it->current++;
if (mongoc_cursor_next(cursor->cursor, &doc)) {
phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
} else {
bson_error_t error;
if (mongoc_cursor_error(cursor->cursor, &error)) {
/* Intentionally not destroying the cursor as it will happen
* naturally now that there are no more results */
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
}
}
} /* }}} */
static void php_phongo_cursor_iterator_rewind(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
php_phongo_cursor_t *cursor = cursor_it->cursor;
const bson_t *doc;
if (cursor_it->current > 0) {
phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot rewind after starting iteration");
return;
}
php_phongo_cursor_free_current(cursor);
doc = mongoc_cursor_current(cursor->cursor);
if (doc) {
phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
}
} /* }}} */
/* iterator handler table */
zend_object_iterator_funcs php_phongo_cursor_iterator_funcs = {
php_phongo_cursor_iterator_dtor,
php_phongo_cursor_iterator_valid,
php_phongo_cursor_iterator_get_current_data,
php_phongo_cursor_iterator_get_current_key,
php_phongo_cursor_iterator_move_forward,
php_phongo_cursor_iterator_rewind,
NULL /* invalidate_current is not used */
};
zend_object_iterator *php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = NULL;
php_phongo_cursor_t *cursor = Z_CURSOR_OBJ_P(object);
if (by_ref) {
zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
}
if (cursor->got_iterator) {
phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot yield multiple iterators");
return NULL;
}
cursor->got_iterator = 1;
cursor_it = ecalloc(1, sizeof(php_phongo_cursor_iterator));
#if PHP_VERSION_ID >= 70000
zend_iterator_init(&cursor_it->intern);
#endif
#if PHP_VERSION_ID >= 70000
ZVAL_COPY(&cursor_it->intern.data, object);
#else
Z_ADDREF_P(object);
cursor_it->intern.data = (void*)object;
#endif
cursor_it->intern.funcs = &php_phongo_cursor_iterator_funcs;
cursor_it->cursor = cursor;
/* cursor_it->current should already be allocated to zero */
php_phongo_cursor_free_current(cursor_it->cursor);
return &cursor_it->intern;
} /* }}} */
/* }}} */
/* {{{ Memory allocation wrappers */
static void* php_phongo_malloc(size_t num_bytes) /* {{{ */
{
return emalloc(num_bytes);
} /* }}} */
static void* php_phongo_calloc(size_t num_members, size_t num_bytes) /* {{{ */
{
return ecalloc(num_members, num_bytes);
} /* }}} */
static void* php_phongo_realloc(void *mem, size_t num_bytes) { /* {{{ */
return erealloc(mem, num_bytes);
} /* }}} */
static void php_phongo_free(void *mem) /* {{{ */
{
if (mem) {
efree(mem);
}
} /* }}} */
/* }}} */
#ifdef PHP_DEBUG
/* LCOV_EXCL_START */
void _phongo_debug_bson(bson_t *bson)
{
char *str;
size_t str_len;
str = bson_as_json(bson, &str_len);
php_printf("JSON: %s\n", str);
bson_free(str);
}
/* LCOV_EXCL_STOP */
#endif
/* {{{ M[INIT|SHUTDOWN] R[INIT|SHUTDOWN] G[INIT|SHUTDOWN] MINFO INI */
ZEND_INI_MH(OnUpdateDebug)
{
void ***ctx = NULL;
char *tmp_dir = NULL;
TSRMLS_SET_CTX(ctx);
/* Close any previously open log files */
if (MONGODB_G(debug_fd)) {
if (MONGODB_G(debug_fd) != stderr && MONGODB_G(debug_fd) != stdout) {
fclose(MONGODB_G(debug_fd));
}
MONGODB_G(debug_fd) = NULL;
}
if (!new_value || (new_value && !phongo_str(new_value)[0])
|| strcasecmp("0", phongo_str(new_value)) == 0
|| strcasecmp("off", phongo_str(new_value)) == 0
|| strcasecmp("no", phongo_str(new_value)) == 0
|| strcasecmp("false", phongo_str(new_value)) == 0
) {
mongoc_log_trace_disable();
mongoc_log_set_handler(NULL, NULL);
#if PHP_VERSION_ID >= 70000
return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#else
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#endif
}
if (strcasecmp(phongo_str(new_value), "stderr") == 0) {
MONGODB_G(debug_fd) = stderr;
} else if (strcasecmp(phongo_str(new_value), "stdout") == 0) {
MONGODB_G(debug_fd) = stdout;
} else if (
strcasecmp("1", phongo_str(new_value)) == 0
|| strcasecmp("on", phongo_str(new_value)) == 0
|| strcasecmp("yes", phongo_str(new_value)) == 0
|| strcasecmp("true", phongo_str(new_value)) == 0
) {
tmp_dir = NULL;
} else {
tmp_dir = phongo_str(new_value);
}
if (!MONGODB_G(debug_fd)) {
time_t t;
int fd = -1;
char *prefix;
int len;
phongo_char *filename;
time(&t);
len = spprintf(&prefix, 0, "PHONGO-%ld", t);
fd = php_open_temporary_fd(tmp_dir, prefix, &filename TSRMLS_CC);
if (fd != -1) {
const char *path = phongo_str(filename);
MONGODB_G(debug_fd) = VCWD_FOPEN(path, "a");
}
efree(filename);
efree(prefix);
close(fd);
}
mongoc_log_trace_enable();
mongoc_log_set_handler(php_phongo_log, ctx);
#if PHP_VERSION_ID >= 70000
return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#else
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#endif
}
/* {{{ INI entries */
PHP_INI_BEGIN()
#if PHP_VERSION_ID >= 70000
STD_PHP_INI_ENTRY(PHONGO_DEBUG_INI, PHONGO_DEBUG_INI_DEFAULT, PHP_INI_ALL, OnUpdateDebug, debug, zend_mongodb_globals, mongodb_globals)
#else
{ 0, PHP_INI_ALL, (char *)PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI), OnUpdateDebug, (void *) XtOffsetOf(zend_mongodb_globals, debug), (void *) &mglo, NULL, (char *)PHONGO_DEBUG_INI_DEFAULT, sizeof(PHONGO_DEBUG_INI_DEFAULT)-1, NULL, 0, 0, 0, NULL },
#endif
PHP_INI_END()
/* }}} */
/* {{{ PHP_GINIT_FUNCTION */
PHP_GINIT_FUNCTION(mongodb)
{
bson_mem_vtable_t bsonMemVTable = {
php_phongo_malloc,
php_phongo_calloc,
php_phongo_realloc,
php_phongo_free,
};
#if PHP_VERSION_ID >= 70000
#if defined(COMPILE_DL_MONGODB) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
#endif
mongodb_globals->debug_fd = NULL;
mongodb_globals->bsonMemVTable = bsonMemVTable;
}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(mongodb)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
REGISTER_INI_ENTRIES();
/* Initialize libmongoc */
mongoc_init();
/* Initialize libbson */
bson_mem_set_vtable(&MONGODB_G(bsonMemVTable));
/* Prep default object handlers to be used when we register the classes */
memcpy(&phongo_std_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
phongo_std_object_handlers.clone_obj = NULL;
/*
phongo_std_object_handlers.get_debug_info = NULL;
phongo_std_object_handlers.compare_objects = NULL;
phongo_std_object_handlers.cast_object = NULL;
phongo_std_object_handlers.count_elements = NULL;
phongo_std_object_handlers.get_closure = NULL;
*/
PHP_MINIT(bson)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Command)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Cursor)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(CursorId)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Manager)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Query)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ReadConcern)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ReadPreference)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Server)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(BulkWrite)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteConcern)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteConcernError)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteError)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteResult)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Exception)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(LogicException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(RuntimeException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(UnexpectedValueException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(InvalidArgumentException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(AuthenticationException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(SSLConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(BulkWriteException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ExecutionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ConnectionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Type)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Serializable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Unserializable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Persistable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Binary)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Javascript)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MaxKey)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MinKey)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ObjectID)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Regex)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Timestamp)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(UTCDateTime)(INIT_FUNC_ARGS_PASSTHRU);
REGISTER_STRING_CONSTANT("MONGODB_VERSION", (char *)MONGODB_VERSION_S, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("MONGODB_STABILITY", (char *)MONGODB_STABILITY_S, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("BSON_NAMESPACE", (char *)BSON_NAMESPACE, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(mongodb)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
bson_mem_restore_vtable();
/* Cleanup after libmongoc */
mongoc_cleanup();
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
/* }}} */
/* {{{ PHP_GSHUTDOWN_FUNCTION */
PHP_GSHUTDOWN_FUNCTION(mongodb)
{
mongodb_globals->debug = NULL;
if (mongodb_globals->debug_fd) {
fclose(mongodb_globals->debug_fd);
mongodb_globals->debug_fd = NULL;
}
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(mongodb)
{
php_info_print_table_start();
php_info_print_table_header(2, "mongodb support", "enabled");
php_info_print_table_row(2, "mongodb version", MONGODB_VERSION_S);
php_info_print_table_row(2, "mongodb stability", MONGODB_STABILITY_S);
#ifdef HAVE_SYSTEM_LIBMONGOC
php_info_print_table_row(2, "libmongoc headers version", MONGOC_VERSION_S);
php_info_print_table_row(2, "libmongoc library version", mongoc_get_version());
#else
/* Bundled libraries, buildtime = runtime */
php_info_print_table_row(2, "libmongoc version", MONGOC_VERSION_S);
#endif
#ifdef HAVE_SYSTEM_LIBBSON
php_info_print_table_row(2, "libbson headers version", BSON_VERSION_S);
php_info_print_table_row(2, "libbson library version", bson_get_version());
#else
php_info_print_table_row(2, "libbson version", BSON_VERSION_S);
#endif
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
}
/* }}} */
/* }}} */
/* {{{ mongodb_functions[]
*/
ZEND_BEGIN_ARG_INFO_EX(ai_bson_fromPHP, 0, 0, 1)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_toPHP, 0, 0, 1)
ZEND_ARG_INFO(0, bson)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_toJSON, 0, 0, 1)
ZEND_ARG_INFO(0, bson)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_fromJSON, 0, 0, 1)
ZEND_ARG_INFO(0, json)
ZEND_END_ARG_INFO();
const zend_function_entry mongodb_functions[] = {
ZEND_NS_FE(BSON_NAMESPACE, fromPHP, ai_bson_fromPHP)
ZEND_NS_FE(BSON_NAMESPACE, toPHP, ai_bson_toPHP)
ZEND_NS_FE(BSON_NAMESPACE, toJSON, ai_bson_toJSON)
ZEND_NS_FE(BSON_NAMESPACE, fromJSON, ai_bson_fromJSON)
PHP_FE_END
};
/* }}} */
/* {{{ mongodb_module_entry
*/
zend_module_entry mongodb_module_entry = {
STANDARD_MODULE_HEADER,
"mongodb",
mongodb_functions,
PHP_MINIT(mongodb),
PHP_MSHUTDOWN(mongodb),
NULL /* PHP_RINIT(mongodb)*/,
NULL /* PHP_RSHUTDOWN(mongodb)*/,
PHP_MINFO(mongodb),
MONGODB_VERSION,
PHP_MODULE_GLOBALS(mongodb),
PHP_GINIT(mongodb),
PHP_GSHUTDOWN(mongodb),
NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
#ifdef COMPILE_DL_MONGODB
ZEND_GET_MODULE(mongodb)
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/php_phongo.h b/mongodb-1.1.6/php_phongo.h
similarity index 99%
rename from mongodb-1.1.5/php_phongo.h
rename to mongodb-1.1.6/php_phongo.h
index 43b902fb..9a8dda1c 100644
--- a/mongodb-1.1.5/php_phongo.h
+++ b/mongodb-1.1.6/php_phongo.h
@@ -1,189 +1,189 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 2014-2015 Hannes Magnusson |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Hannes Magnusson <bjori@php.net> |
+----------------------------------------------------------------------+
*/
#ifndef PHONGO_H
#define PHONGO_H
/* External libs */
#include "bson.h"
#include "mongoc.h"
#include "mongoc-topology-description-private.h"
#define phpext_mongodb_ptr &mongodb_module_entry
extern zend_module_entry mongodb_module_entry;
/* FIXME: Its annoying to bump version. Move into phongo_version.h.in */
-#define MONGODB_VERSION_S "1.1.5"
+#define MONGODB_VERSION_S "1.1.6"
#define MONGODB_STABILITY_S "stable"
#define MONGODB_VERSION MONGODB_VERSION_S
#ifdef PHP_WIN32
# define PHONGO_API __declspec(dllexport)
# include "ext/standard/flock_compat.h"
#elif defined(__GNUC__) && __GNUC__ >= 4
# define PHONGO_API __attribute__ ((visibility("default")))
#else
# define PHONGO_API
#endif
#ifdef ZTS
# include "TSRM.h"
# define PHONGO_STREAM_CTX(x) x
#else
# define PHONGO_STREAM_CTX(x) NULL
#endif
ZEND_BEGIN_MODULE_GLOBALS(mongodb)
char *debug;
FILE *debug_fd;
bson_mem_vtable_t bsonMemVTable;
ZEND_END_MODULE_GLOBALS(mongodb)
#if PHP_VERSION_ID >= 70000
# define MONGODB_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mongodb, v)
#else
# ifdef ZTS
# define MONGODB_G(v) TSRMG(mongodb_globals_id, zend_mongodb_globals *, v)
# define mglo mongodb_globals_id
# else
# define MONGODB_G(v) (mongodb_globals.v)
# define mglo mongodb_globals
# endif
#endif
#define PHONGO_WRITE_CONCERN_W_MAJORITY "majority"
#include "php_phongo_classes.h"
typedef enum {
PHONGO_ERROR_INVALID_ARGUMENT = 1,
PHONGO_ERROR_RUNTIME = 2,
PHONGO_ERROR_UNEXPECTED_VALUE = 8,
PHONGO_ERROR_MONGOC_FAILED = 3,
PHONGO_ERROR_WRITE_FAILED = 5,
PHONGO_ERROR_CONNECTION_FAILED = 7,
PHONGO_ERROR_LOGIC = 9
} php_phongo_error_domain_t;
typedef struct
{
void (*writer)(mongoc_stream_t *stream, int32_t timeout_msec, ssize_t sent, size_t iovcnt);
} php_phongo_stream_logger;
typedef struct
{
mongoc_stream_t vtable;
php_stream *stream;
const mongoc_uri_t *uri;
const mongoc_host_list_t *host;
#if ZTS
void ***tsrm_ls;
#endif
} php_phongo_stream_socket;
PHONGO_API zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
PHONGO_API zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
#if PHP_VERSION_ID < 70000
# ifndef PHP_WIN32
# ifdef ZTS
__attribute__ ((format(printf, 3, 4)))
# else
__attribute__ ((format(printf, 2, 3)))
# endif
# endif
#endif
;
void phongo_throw_exception_from_bson_error_t(bson_error_t *error TSRMLS_DC);
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void);
void phongo_server_init (zval *return_value, mongoc_client_t *client, int server_id TSRMLS_DC);
void phongo_readconcern_init (zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC);
void phongo_readpreference_init (zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC);
void phongo_writeconcern_init (zval *return_value, const mongoc_write_concern_t *write_concern TSRMLS_DC);
bool phongo_query_init (php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC);
mongoc_bulk_operation_t* phongo_bulkwrite_init (zend_bool ordered);
bool phongo_execute_write (mongoc_client_t *client, const char *namespace, mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
int phongo_execute_command (mongoc_client_t *client, const char *db, const bson_t *command, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
int phongo_execute_query (mongoc_client_t *client, const char *namespace, const php_phongo_query_t *query, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
mongoc_stream_t* phongo_stream_initiator (const mongoc_uri_t *uri, const mongoc_host_list_t *host, void *user_data, bson_error_t *error);
const mongoc_read_concern_t* phongo_read_concern_from_zval (zval *zread_concern TSRMLS_DC);
const mongoc_read_prefs_t* phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC);
const mongoc_write_concern_t* phongo_write_concern_from_zval (zval *zwrite_concern TSRMLS_DC);
const php_phongo_query_t* phongo_query_from_zval (zval *zquery TSRMLS_DC);
void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *sd);
void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern);
void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs);
void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern);
void php_phongo_cursor_to_zval(zval *retval, const mongoc_cursor_t *cursor);
bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC);
void php_phongo_objectid_new_from_oid(zval *object, const bson_oid_t *oid TSRMLS_DC);
void php_phongo_cursor_id_new_from_id(zval *object, int64_t cursorid TSRMLS_DC);
void php_phongo_new_utcdatetime_from_epoch(zval *object, int64_t msec_since_epoch TSRMLS_DC);
void php_phongo_new_datetime_from_utcdatetime(zval *object, int64_t milliseconds TSRMLS_DC);
void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, uint32_t increment, uint32_t timestamp TSRMLS_DC);
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC);
void php_phongo_new_javascript_from_javascript_and_scope(int init, zval *object, const char *code, size_t code_len, const bson_t *scope TSRMLS_DC);
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC);
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC);
zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
void php_phongo_cursor_free(php_phongo_cursor_t *cursor);
zend_object_iterator* php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
#if PHP_VERSION_ID >= 70000
#define PHONGO_CE_INIT(ce) do { \
ce->ce_flags |= ZEND_ACC_FINAL; \
ce->serialize = zend_class_serialize_deny; \
ce->unserialize = zend_class_unserialize_deny; \
} while(0);
#else
#define PHONGO_CE_INIT(ce) do { \
ce->ce_flags |= ZEND_ACC_FINAL_CLASS; \
ce->serialize = zend_class_serialize_deny; \
ce->unserialize = zend_class_unserialize_deny; \
} while(0);
#endif
#ifdef PHP_DEBUG
void _phongo_debug_bson(bson_t *bson);
#else
#define _phongo_debug_bson(bson)
#endif
PHP_MINIT_FUNCTION(bson);
#endif /* PHONGO_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/php_phongo_classes.h b/mongodb-1.1.6/php_phongo_classes.h
similarity index 100%
rename from mongodb-1.1.5/php_phongo_classes.h
rename to mongodb-1.1.6/php_phongo_classes.h
diff --git a/mongodb-1.1.5/php_phongo_structs-5.h b/mongodb-1.1.6/php_phongo_structs-5.h
similarity index 99%
rename from mongodb-1.1.5/php_phongo_structs-5.h
rename to mongodb-1.1.6/php_phongo_structs-5.h
index 37d9d983..5eb6804e 100644
--- a/mongodb-1.1.5/php_phongo_structs-5.h
+++ b/mongodb-1.1.6/php_phongo_structs-5.h
@@ -1,176 +1,176 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifndef PHONGO_STRUCTS_H
#define PHONGO_STRUCTS_H
/* PHP Core stuff */
#include <php.h>
#include <mongoc-bulk-operation-private.h>
/* Our stuffz */
#include "php_bson.h"
typedef struct {
zend_object std;
bson_t *bson;
} php_phongo_command_t;
typedef struct {
zend_object std;
mongoc_cursor_t *cursor;
mongoc_client_t *client;
int server_id;
php_phongo_bson_state visitor_data;
int got_iterator;
} php_phongo_cursor_t;
typedef struct {
zend_object std;
uint64_t id;
} php_phongo_cursorid_t;
typedef struct {
zend_object std;
mongoc_client_t *client;
} php_phongo_manager_t;
typedef struct {
zend_object std;
bson_t *query;
bson_t *selector;
mongoc_query_flags_t flags;
uint32_t skip;
uint32_t limit;
uint32_t batch_size;
mongoc_read_concern_t *read_concern;
} php_phongo_query_t;
typedef struct {
zend_object std;
mongoc_read_concern_t *read_concern;
} php_phongo_readconcern_t;
typedef struct {
zend_object std;
mongoc_read_prefs_t *read_preference;
} php_phongo_readpreference_t;
typedef struct {
zend_object std;
mongoc_client_t *client;
int server_id;
} php_phongo_server_t;
typedef struct {
zend_object std;
mongoc_bulk_operation_t *bulk;
} php_phongo_bulkwrite_t;
typedef struct {
zend_object std;
mongoc_write_concern_t *write_concern;
} php_phongo_writeconcern_t;
typedef struct {
zend_object std;
int code;
char *message;
zval *info;
} php_phongo_writeconcernerror_t;
typedef struct {
zend_object std;
int code;
char *message;
zval *info;
uint32_t index;
} php_phongo_writeerror_t;
typedef struct {
zend_object std;
mongoc_write_concern_t *write_concern;
- mongoc_write_result_t write_result;
+ bson_t *reply;
mongoc_client_t *client;
int server_id;
} php_phongo_writeresult_t;
typedef struct {
zend_object std;
char *data;
int data_len;
uint8_t type;
} php_phongo_binary_t;
typedef struct {
zend_object std;
} php_phongo_int32_t;
typedef struct {
zend_object std;
} php_phongo_int64_t;
typedef struct {
zend_object std;
char *javascript;
size_t javascript_len;
bson_t *document;
} php_phongo_javascript_t;
typedef struct {
zend_object std;
} php_phongo_log_t;
typedef struct {
zend_object std;
} php_phongo_maxkey_t;
typedef struct {
zend_object std;
} php_phongo_minkey_t;
typedef struct {
zend_object std;
char oid[25];
} php_phongo_objectid_t;
typedef struct {
zend_object std;
char *pattern;
int pattern_len;
char *flags;
int flags_len;
} php_phongo_regex_t;
typedef struct {
zend_object std;
uint32_t increment;
uint32_t timestamp;
} php_phongo_timestamp_t;
typedef struct {
zend_object std;
int64_t milliseconds;
} php_phongo_utcdatetime_t;
#endif /* PHONGO_STRUCTS */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/php_phongo_structs-7.h b/mongodb-1.1.6/php_phongo_structs-7.h
similarity index 99%
rename from mongodb-1.1.5/php_phongo_structs-7.h
rename to mongodb-1.1.6/php_phongo_structs-7.h
index 15f2493f..408650be 100644
--- a/mongodb-1.1.5/php_phongo_structs-7.h
+++ b/mongodb-1.1.6/php_phongo_structs-7.h
@@ -1,250 +1,250 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifndef PHONGO_STRUCTS_H
#define PHONGO_STRUCTS_H
/* PHP Core stuff */
#include <php.h>
#include <mongoc-bulk-operation-private.h>
/* Our stuffz */
#include "php_bson.h"
typedef struct {
bson_t *bson;
zend_object std;
} php_phongo_command_t;
typedef struct {
mongoc_cursor_t *cursor;
mongoc_client_t *client;
int server_id;
php_phongo_bson_state visitor_data;
int got_iterator;
zend_object std;
} php_phongo_cursor_t;
typedef struct {
uint64_t id;
zend_object std;
} php_phongo_cursorid_t;
typedef struct {
mongoc_client_t *client;
zend_object std;
} php_phongo_manager_t;
typedef struct {
bson_t *query;
bson_t *selector;
mongoc_query_flags_t flags;
uint32_t skip;
uint32_t limit;
uint32_t batch_size;
mongoc_read_concern_t *read_concern;
zend_object std;
} php_phongo_query_t;
typedef struct {
mongoc_read_concern_t *read_concern;
zend_object std;
} php_phongo_readconcern_t;
typedef struct {
mongoc_read_prefs_t *read_preference;
zend_object std;
} php_phongo_readpreference_t;
typedef struct {
mongoc_client_t *client;
int server_id;
zend_object std;
} php_phongo_server_t;
typedef struct {
mongoc_bulk_operation_t *bulk;
zend_object std;
} php_phongo_bulkwrite_t;
typedef struct {
mongoc_write_concern_t *write_concern;
zend_object std;
} php_phongo_writeconcern_t;
typedef struct {
int code;
char *message;
zval info;
zend_object std;
} php_phongo_writeconcernerror_t;
typedef struct {
int code;
char *message;
zval info;
uint32_t index;
zend_object std;
} php_phongo_writeerror_t;
typedef struct {
mongoc_write_concern_t *write_concern;
- mongoc_write_result_t write_result;
+ bson_t *reply;
mongoc_client_t *client;
int server_id;
zend_object std;
} php_phongo_writeresult_t;
typedef struct {
char *data;
int data_len;
int type;
zend_object std;
} php_phongo_binary_t;
typedef struct {
zend_object std;
} php_phongo_int32_t;
typedef struct {
zend_object std;
} php_phongo_int64_t;
typedef struct {
char *javascript;
size_t javascript_len;
bson_t *document;
zend_object std;
} php_phongo_javascript_t;
typedef struct {
zend_object std;
} php_phongo_log_t;
typedef struct {
zend_object std;
} php_phongo_maxkey_t;
typedef struct {
zend_object std;
} php_phongo_minkey_t;
typedef struct {
char oid[25];
zend_object std;
} php_phongo_objectid_t;
typedef struct {
char *pattern;
int pattern_len;
char *flags;
int flags_len;
zend_object std;
} php_phongo_regex_t;
typedef struct {
uint32_t increment;
uint32_t timestamp;
zend_object std;
} php_phongo_timestamp_t;
typedef struct {
int64_t milliseconds;
zend_object std;
} php_phongo_utcdatetime_t;
static inline php_phongo_command_t* php_command_fetch_object(zend_object *obj) {
return (php_phongo_command_t *)((char *)obj - XtOffsetOf(php_phongo_command_t, std));
}
static inline php_phongo_cursor_t* php_cursor_fetch_object(zend_object *obj) {
return (php_phongo_cursor_t *)((char *)obj - XtOffsetOf(php_phongo_cursor_t, std));
}
static inline php_phongo_cursorid_t* php_cursorid_fetch_object(zend_object *obj) {
return (php_phongo_cursorid_t *)((char *)obj - XtOffsetOf(php_phongo_cursorid_t, std));
}
static inline php_phongo_manager_t* php_manager_fetch_object(zend_object *obj) {
return (php_phongo_manager_t *)((char *)obj - XtOffsetOf(php_phongo_manager_t, std));
}
static inline php_phongo_query_t* php_query_fetch_object(zend_object *obj) {
return (php_phongo_query_t *)((char *)obj - XtOffsetOf(php_phongo_query_t, std));
}
static inline php_phongo_readconcern_t* php_readconcern_fetch_object(zend_object *obj) {
return (php_phongo_readconcern_t *)((char *)obj - XtOffsetOf(php_phongo_readconcern_t, std));
}
static inline php_phongo_readpreference_t* php_readpreference_fetch_object(zend_object *obj) {
return (php_phongo_readpreference_t *)((char *)obj - XtOffsetOf(php_phongo_readpreference_t, std));
}
static inline php_phongo_server_t* php_server_fetch_object(zend_object *obj) {
return (php_phongo_server_t *)((char *)obj - XtOffsetOf(php_phongo_server_t, std));
}
static inline php_phongo_bulkwrite_t* php_bulkwrite_fetch_object(zend_object *obj) {
return (php_phongo_bulkwrite_t *)((char *)obj - XtOffsetOf(php_phongo_bulkwrite_t, std));
}
static inline php_phongo_writeconcern_t* php_writeconcern_fetch_object(zend_object *obj) {
return (php_phongo_writeconcern_t *)((char *)obj - XtOffsetOf(php_phongo_writeconcern_t, std));
}
static inline php_phongo_writeconcernerror_t* php_writeconcernerror_fetch_object(zend_object *obj) {
return (php_phongo_writeconcernerror_t *)((char *)obj - XtOffsetOf(php_phongo_writeconcernerror_t, std));
}
static inline php_phongo_writeerror_t* php_writeerror_fetch_object(zend_object *obj) {
return (php_phongo_writeerror_t *)((char *)obj - XtOffsetOf(php_phongo_writeerror_t, std));
}
static inline php_phongo_writeresult_t* php_writeresult_fetch_object(zend_object *obj) {
return (php_phongo_writeresult_t *)((char *)obj - XtOffsetOf(php_phongo_writeresult_t, std));
}
static inline php_phongo_binary_t* php_binary_fetch_object(zend_object *obj) {
return (php_phongo_binary_t *)((char *)obj - XtOffsetOf(php_phongo_binary_t, std));
}
static inline php_phongo_int32_t* php_int32_fetch_object(zend_object *obj) {
return (php_phongo_int32_t *)((char *)obj - XtOffsetOf(php_phongo_int32_t, std));
}
static inline php_phongo_int64_t* php_int64_fetch_object(zend_object *obj) {
return (php_phongo_int64_t *)((char *)obj - XtOffsetOf(php_phongo_int64_t, std));
}
static inline php_phongo_javascript_t* php_javascript_fetch_object(zend_object *obj) {
return (php_phongo_javascript_t *)((char *)obj - XtOffsetOf(php_phongo_javascript_t, std));
}
static inline php_phongo_log_t* php_log_fetch_object(zend_object *obj) {
return (php_phongo_log_t *)((char *)obj - XtOffsetOf(php_phongo_log_t, std));
}
static inline php_phongo_maxkey_t* php_maxkey_fetch_object(zend_object *obj) {
return (php_phongo_maxkey_t *)((char *)obj - XtOffsetOf(php_phongo_maxkey_t, std));
}
static inline php_phongo_minkey_t* php_minkey_fetch_object(zend_object *obj) {
return (php_phongo_minkey_t *)((char *)obj - XtOffsetOf(php_phongo_minkey_t, std));
}
static inline php_phongo_objectid_t* php_objectid_fetch_object(zend_object *obj) {
return (php_phongo_objectid_t *)((char *)obj - XtOffsetOf(php_phongo_objectid_t, std));
}
static inline php_phongo_regex_t* php_regex_fetch_object(zend_object *obj) {
return (php_phongo_regex_t *)((char *)obj - XtOffsetOf(php_phongo_regex_t, std));
}
static inline php_phongo_timestamp_t* php_timestamp_fetch_object(zend_object *obj) {
return (php_phongo_timestamp_t *)((char *)obj - XtOffsetOf(php_phongo_timestamp_t, std));
}
static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object *obj) {
return (php_phongo_utcdatetime_t *)((char *)obj - XtOffsetOf(php_phongo_utcdatetime_t, std));
}
#endif /* PHONGO_STRUCTS */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/scripts/centos/essentials.sh b/mongodb-1.1.6/scripts/centos/essentials.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/essentials.sh
rename to mongodb-1.1.6/scripts/centos/essentials.sh
diff --git a/mongodb-1.1.5/scripts/centos/ldap/Domain.ldif b/mongodb-1.1.6/scripts/centos/ldap/Domain.ldif
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/Domain.ldif
rename to mongodb-1.1.6/scripts/centos/ldap/Domain.ldif
diff --git a/mongodb-1.1.5/scripts/centos/ldap/Users.ldif b/mongodb-1.1.6/scripts/centos/ldap/Users.ldif
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/Users.ldif
rename to mongodb-1.1.6/scripts/centos/ldap/Users.ldif
diff --git a/mongodb-1.1.5/scripts/centos/ldap/basics.ldif b/mongodb-1.1.6/scripts/centos/ldap/basics.ldif
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/basics.ldif
rename to mongodb-1.1.6/scripts/centos/ldap/basics.ldif
diff --git a/mongodb-1.1.5/scripts/centos/ldap/install.sh b/mongodb-1.1.6/scripts/centos/ldap/install.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/install.sh
rename to mongodb-1.1.6/scripts/centos/ldap/install.sh
diff --git a/mongodb-1.1.5/scripts/centos/ldap/mongod.ldif b/mongodb-1.1.6/scripts/centos/ldap/mongod.ldif
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/mongod.ldif
rename to mongodb-1.1.6/scripts/centos/ldap/mongod.ldif
diff --git a/mongodb-1.1.5/scripts/centos/ldap/pw.ldif b/mongodb-1.1.6/scripts/centos/ldap/pw.ldif
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/pw.ldif
rename to mongodb-1.1.6/scripts/centos/ldap/pw.ldif
diff --git a/mongodb-1.1.5/scripts/centos/ldap/saslauthd.conf b/mongodb-1.1.6/scripts/centos/ldap/saslauthd.conf
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/saslauthd.conf
rename to mongodb-1.1.6/scripts/centos/ldap/saslauthd.conf
diff --git a/mongodb-1.1.5/scripts/centos/ldap/users b/mongodb-1.1.6/scripts/centos/ldap/users
similarity index 100%
rename from mongodb-1.1.5/scripts/centos/ldap/users
rename to mongodb-1.1.6/scripts/centos/ldap/users
diff --git a/mongodb-1.1.5/scripts/convert-mo-tests.php b/mongodb-1.1.6/scripts/convert-mo-tests.php
similarity index 100%
rename from mongodb-1.1.5/scripts/convert-mo-tests.php
rename to mongodb-1.1.6/scripts/convert-mo-tests.php
diff --git a/mongodb-1.1.5/scripts/freebsd/essentials.sh b/mongodb-1.1.6/scripts/freebsd/essentials.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/freebsd/essentials.sh
rename to mongodb-1.1.6/scripts/freebsd/essentials.sh
diff --git a/mongodb-1.1.5/scripts/freebsd/phongo.sh b/mongodb-1.1.6/scripts/freebsd/phongo.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/freebsd/phongo.sh
rename to mongodb-1.1.6/scripts/freebsd/phongo.sh
diff --git a/mongodb-1.1.5/scripts/list-servers.php b/mongodb-1.1.6/scripts/list-servers.php
similarity index 100%
rename from mongodb-1.1.5/scripts/list-servers.php
rename to mongodb-1.1.6/scripts/list-servers.php
diff --git a/mongodb-1.1.5/scripts/presets/replicaset-30.json b/mongodb-1.1.6/scripts/presets/replicaset-30.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/replicaset-30.json
rename to mongodb-1.1.6/scripts/presets/replicaset-30.json
diff --git a/mongodb-1.1.5/scripts/presets/replicaset.json b/mongodb-1.1.6/scripts/presets/replicaset.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/replicaset.json
rename to mongodb-1.1.6/scripts/presets/replicaset.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-24.json b/mongodb-1.1.6/scripts/presets/standalone-24.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-24.json
rename to mongodb-1.1.6/scripts/presets/standalone-24.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-26.json b/mongodb-1.1.6/scripts/presets/standalone-26.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-26.json
rename to mongodb-1.1.6/scripts/presets/standalone-26.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-30.json b/mongodb-1.1.6/scripts/presets/standalone-30.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-30.json
rename to mongodb-1.1.6/scripts/presets/standalone-30.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-auth.json b/mongodb-1.1.6/scripts/presets/standalone-auth.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-auth.json
rename to mongodb-1.1.6/scripts/presets/standalone-auth.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-plain.json b/mongodb-1.1.6/scripts/presets/standalone-plain.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-plain.json
rename to mongodb-1.1.6/scripts/presets/standalone-plain.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-ssl.json b/mongodb-1.1.6/scripts/presets/standalone-ssl.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-ssl.json
rename to mongodb-1.1.6/scripts/presets/standalone-ssl.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone-x509.json b/mongodb-1.1.6/scripts/presets/standalone-x509.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone-x509.json
rename to mongodb-1.1.6/scripts/presets/standalone-x509.json
diff --git a/mongodb-1.1.5/scripts/presets/standalone.json b/mongodb-1.1.6/scripts/presets/standalone.json
similarity index 100%
rename from mongodb-1.1.5/scripts/presets/standalone.json
rename to mongodb-1.1.6/scripts/presets/standalone.json
diff --git a/mongodb-1.1.5/scripts/ssl/ca.pem b/mongodb-1.1.6/scripts/ssl/ca.pem
similarity index 100%
rename from mongodb-1.1.5/scripts/ssl/ca.pem
rename to mongodb-1.1.6/scripts/ssl/ca.pem
diff --git a/mongodb-1.1.5/scripts/ssl/client.pem b/mongodb-1.1.6/scripts/ssl/client.pem
similarity index 100%
rename from mongodb-1.1.5/scripts/ssl/client.pem
rename to mongodb-1.1.6/scripts/ssl/client.pem
diff --git a/mongodb-1.1.5/scripts/ssl/crl.pem b/mongodb-1.1.6/scripts/ssl/crl.pem
similarity index 100%
rename from mongodb-1.1.5/scripts/ssl/crl.pem
rename to mongodb-1.1.6/scripts/ssl/crl.pem
diff --git a/mongodb-1.1.5/scripts/ssl/server.pem b/mongodb-1.1.6/scripts/ssl/server.pem
similarity index 100%
rename from mongodb-1.1.5/scripts/ssl/server.pem
rename to mongodb-1.1.6/scripts/ssl/server.pem
diff --git a/mongodb-1.1.5/scripts/start-servers.php b/mongodb-1.1.6/scripts/start-servers.php
similarity index 100%
rename from mongodb-1.1.5/scripts/start-servers.php
rename to mongodb-1.1.6/scripts/start-servers.php
diff --git a/mongodb-1.1.5/scripts/ubuntu/essentials.sh b/mongodb-1.1.6/scripts/ubuntu/essentials.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/ubuntu/essentials.sh
rename to mongodb-1.1.6/scripts/ubuntu/essentials.sh
diff --git a/mongodb-1.1.5/scripts/ubuntu/ldap/install.sh b/mongodb-1.1.6/scripts/ubuntu/ldap/install.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/ubuntu/ldap/install.sh
rename to mongodb-1.1.6/scripts/ubuntu/ldap/install.sh
diff --git a/mongodb-1.1.5/scripts/ubuntu/ldap/saslauthd.conf b/mongodb-1.1.6/scripts/ubuntu/ldap/saslauthd.conf
similarity index 100%
rename from mongodb-1.1.5/scripts/ubuntu/ldap/saslauthd.conf
rename to mongodb-1.1.6/scripts/ubuntu/ldap/saslauthd.conf
diff --git a/mongodb-1.1.5/scripts/ubuntu/mongo-orchestration.sh b/mongodb-1.1.6/scripts/ubuntu/mongo-orchestration.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/ubuntu/mongo-orchestration.sh
rename to mongodb-1.1.6/scripts/ubuntu/mongo-orchestration.sh
diff --git a/mongodb-1.1.5/scripts/ubuntu/phongo.sh b/mongodb-1.1.6/scripts/ubuntu/phongo.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/ubuntu/phongo.sh
rename to mongodb-1.1.6/scripts/ubuntu/phongo.sh
diff --git a/mongodb-1.1.5/scripts/vmware/kernel.sh b/mongodb-1.1.6/scripts/vmware/kernel.sh
similarity index 100%
rename from mongodb-1.1.5/scripts/vmware/kernel.sh
rename to mongodb-1.1.6/scripts/vmware/kernel.sh
diff --git a/mongodb-1.1.5/src/BSON/Binary.c b/mongodb-1.1.6/src/BSON/Binary.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Binary.c
rename to mongodb-1.1.6/src/BSON/Binary.c
diff --git a/mongodb-1.1.5/src/BSON/Javascript.c b/mongodb-1.1.6/src/BSON/Javascript.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Javascript.c
rename to mongodb-1.1.6/src/BSON/Javascript.c
diff --git a/mongodb-1.1.5/src/BSON/MaxKey.c b/mongodb-1.1.6/src/BSON/MaxKey.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/MaxKey.c
rename to mongodb-1.1.6/src/BSON/MaxKey.c
diff --git a/mongodb-1.1.5/src/BSON/MinKey.c b/mongodb-1.1.6/src/BSON/MinKey.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/MinKey.c
rename to mongodb-1.1.6/src/BSON/MinKey.c
diff --git a/mongodb-1.1.5/src/BSON/ObjectID.c b/mongodb-1.1.6/src/BSON/ObjectID.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/ObjectID.c
rename to mongodb-1.1.6/src/BSON/ObjectID.c
diff --git a/mongodb-1.1.5/src/BSON/Persistable.c b/mongodb-1.1.6/src/BSON/Persistable.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Persistable.c
rename to mongodb-1.1.6/src/BSON/Persistable.c
diff --git a/mongodb-1.1.5/src/BSON/Regex.c b/mongodb-1.1.6/src/BSON/Regex.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Regex.c
rename to mongodb-1.1.6/src/BSON/Regex.c
diff --git a/mongodb-1.1.5/src/BSON/Serializable.c b/mongodb-1.1.6/src/BSON/Serializable.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Serializable.c
rename to mongodb-1.1.6/src/BSON/Serializable.c
diff --git a/mongodb-1.1.5/src/BSON/Timestamp.c b/mongodb-1.1.6/src/BSON/Timestamp.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Timestamp.c
rename to mongodb-1.1.6/src/BSON/Timestamp.c
diff --git a/mongodb-1.1.5/src/BSON/Type.c b/mongodb-1.1.6/src/BSON/Type.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Type.c
rename to mongodb-1.1.6/src/BSON/Type.c
diff --git a/mongodb-1.1.5/src/BSON/UTCDateTime.c b/mongodb-1.1.6/src/BSON/UTCDateTime.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/UTCDateTime.c
rename to mongodb-1.1.6/src/BSON/UTCDateTime.c
diff --git a/mongodb-1.1.5/src/BSON/Unserializable.c b/mongodb-1.1.6/src/BSON/Unserializable.c
similarity index 100%
rename from mongodb-1.1.5/src/BSON/Unserializable.c
rename to mongodb-1.1.6/src/BSON/Unserializable.c
diff --git a/mongodb-1.1.5/src/MongoDB/BulkWrite.c b/mongodb-1.1.6/src/MongoDB/BulkWrite.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/BulkWrite.c
rename to mongodb-1.1.6/src/MongoDB/BulkWrite.c
diff --git a/mongodb-1.1.5/src/MongoDB/Command.c b/mongodb-1.1.6/src/MongoDB/Command.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Command.c
rename to mongodb-1.1.6/src/MongoDB/Command.c
diff --git a/mongodb-1.1.5/src/MongoDB/Cursor.c b/mongodb-1.1.6/src/MongoDB/Cursor.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Cursor.c
rename to mongodb-1.1.6/src/MongoDB/Cursor.c
diff --git a/mongodb-1.1.5/src/MongoDB/CursorId.c b/mongodb-1.1.6/src/MongoDB/CursorId.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/CursorId.c
rename to mongodb-1.1.6/src/MongoDB/CursorId.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/AuthenticationException.c b/mongodb-1.1.6/src/MongoDB/Exception/AuthenticationException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/AuthenticationException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/AuthenticationException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/BulkWriteException.c b/mongodb-1.1.6/src/MongoDB/Exception/BulkWriteException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/BulkWriteException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/BulkWriteException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/ConnectionException.c b/mongodb-1.1.6/src/MongoDB/Exception/ConnectionException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/ConnectionException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/ConnectionException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/ConnectionTimeoutException.c b/mongodb-1.1.6/src/MongoDB/Exception/ConnectionTimeoutException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/ConnectionTimeoutException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/ConnectionTimeoutException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/Exception.c b/mongodb-1.1.6/src/MongoDB/Exception/Exception.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/Exception.c
rename to mongodb-1.1.6/src/MongoDB/Exception/Exception.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/ExecutionTimeoutException.c b/mongodb-1.1.6/src/MongoDB/Exception/ExecutionTimeoutException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/ExecutionTimeoutException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/ExecutionTimeoutException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/InvalidArgumentException.c b/mongodb-1.1.6/src/MongoDB/Exception/InvalidArgumentException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/InvalidArgumentException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/InvalidArgumentException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/LogicException.c b/mongodb-1.1.6/src/MongoDB/Exception/LogicException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/LogicException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/LogicException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/RuntimeException.c b/mongodb-1.1.6/src/MongoDB/Exception/RuntimeException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/RuntimeException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/RuntimeException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/SSLConnectionException.c b/mongodb-1.1.6/src/MongoDB/Exception/SSLConnectionException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/SSLConnectionException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/SSLConnectionException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/UnexpectedValueException.c b/mongodb-1.1.6/src/MongoDB/Exception/UnexpectedValueException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/UnexpectedValueException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/UnexpectedValueException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Exception/WriteException.c b/mongodb-1.1.6/src/MongoDB/Exception/WriteException.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Exception/WriteException.c
rename to mongodb-1.1.6/src/MongoDB/Exception/WriteException.c
diff --git a/mongodb-1.1.5/src/MongoDB/Manager.c b/mongodb-1.1.6/src/MongoDB/Manager.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Manager.c
rename to mongodb-1.1.6/src/MongoDB/Manager.c
diff --git a/mongodb-1.1.5/src/MongoDB/Query.c b/mongodb-1.1.6/src/MongoDB/Query.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Query.c
rename to mongodb-1.1.6/src/MongoDB/Query.c
diff --git a/mongodb-1.1.5/src/MongoDB/ReadConcern.c b/mongodb-1.1.6/src/MongoDB/ReadConcern.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/ReadConcern.c
rename to mongodb-1.1.6/src/MongoDB/ReadConcern.c
diff --git a/mongodb-1.1.5/src/MongoDB/ReadPreference.c b/mongodb-1.1.6/src/MongoDB/ReadPreference.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/ReadPreference.c
rename to mongodb-1.1.6/src/MongoDB/ReadPreference.c
diff --git a/mongodb-1.1.5/src/MongoDB/Server.c b/mongodb-1.1.6/src/MongoDB/Server.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/Server.c
rename to mongodb-1.1.6/src/MongoDB/Server.c
diff --git a/mongodb-1.1.5/src/MongoDB/WriteConcern.c b/mongodb-1.1.6/src/MongoDB/WriteConcern.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/WriteConcern.c
rename to mongodb-1.1.6/src/MongoDB/WriteConcern.c
diff --git a/mongodb-1.1.5/src/MongoDB/WriteConcernError.c b/mongodb-1.1.6/src/MongoDB/WriteConcernError.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/WriteConcernError.c
rename to mongodb-1.1.6/src/MongoDB/WriteConcernError.c
diff --git a/mongodb-1.1.5/src/MongoDB/WriteError.c b/mongodb-1.1.6/src/MongoDB/WriteError.c
similarity index 100%
rename from mongodb-1.1.5/src/MongoDB/WriteError.c
rename to mongodb-1.1.6/src/MongoDB/WriteError.c
diff --git a/mongodb-1.1.5/src/MongoDB/WriteResult.c b/mongodb-1.1.6/src/MongoDB/WriteResult.c
similarity index 78%
rename from mongodb-1.1.5/src/MongoDB/WriteResult.c
rename to mongodb-1.1.6/src/MongoDB/WriteResult.c
index 61049845..ddc5b609 100644
--- a/mongodb-1.1.5/src/MongoDB/WriteResult.c
+++ b/mongodb-1.1.6/src/MongoDB/WriteResult.c
@@ -1,578 +1,613 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-write-concern-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
+#define RETURN_LONG_FROM_BSON_INT32(iter, bson, key) \
+ if (bson_iter_init_find((iter), (bson), (key)) && BSON_ITER_HOLDS_INT32((iter))) { \
+ RETURN_LONG(bson_iter_int32((iter))); \
+ }
PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
zend_object_handlers php_phongo_handler_writeresult;
/* {{{ proto integer WriteResult::getInsertedCount()
Returns the number of documents that were inserted */
PHP_METHOD(WriteResult, getInsertedCount)
{
+ bson_iter_t iter;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
-
- RETURN_LONG(intern->write_result.nInserted);
+ RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nInserted");
}
/* }}} */
/* {{{ proto integer WriteResult::getMatchedCount()
Returns the number of documents that matched the update criteria */
PHP_METHOD(WriteResult, getMatchedCount)
{
+ bson_iter_t iter;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
-
- RETURN_LONG(intern->write_result.nMatched);
+ RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nMatched");
}
/* }}} */
/* {{{ proto integer|null WriteResult::getModifiedCount()
Returns the number of documents that were actually modified by an update */
PHP_METHOD(WriteResult, getModifiedCount)
{
+ bson_iter_t iter;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
- if (intern->write_result.omit_nModified) {
- RETURN_NULL();
- }
-
- RETURN_LONG(intern->write_result.nModified);
+ RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nModified");
}
/* }}} */
/* {{{ proto integer WriteResult::getDeletedCount()
Returns the number of documents that were deleted */
PHP_METHOD(WriteResult, getDeletedCount)
{
+ bson_iter_t iter;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
-
- RETURN_LONG(intern->write_result.nRemoved);
+ RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nRemoved");
}
/* }}} */
/* {{{ proto integer WriteResult::getUpsertedCount()
Returns the number of documents that were upserted */
PHP_METHOD(WriteResult, getUpsertedCount)
{
+ bson_iter_t iter;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
-
- RETURN_LONG(intern->write_result.nUpserted);
+ RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nUpserted");
}
/* }}} */
/* {{{ proto MongoDB\Driver\Server WriteResult::getServer()
Returns the Server from which the result originated */
PHP_METHOD(WriteResult, getServer)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
phongo_server_init(return_value, intern->client, intern->server_id TSRMLS_CC);
}
/* }}} */
/* {{{ proto array WriteResult::getUpsertedIds()
Returns the identifiers generated by the server for upsert operations. */
PHP_METHOD(WriteResult, getUpsertedIds)
{
+ bson_iter_t iter, child;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
- if (!bson_empty0(&intern->write_result.upserted)) {
- bson_iter_t iter;
-
- bson_iter_init(&iter, &intern->write_result.upserted);
-
- while (bson_iter_next(&iter)) {
+ if (bson_iter_init_find(&iter, intern->reply, "upserted") && BSON_ITER_HOLDS_ARRAY(&iter) && bson_iter_recurse(&iter, &child)) {
+ while (bson_iter_next(&child)) {
int32_t index;
bson_iter_t outer;
- if (!BSON_ITER_HOLDS_DOCUMENT(&iter) || !bson_iter_recurse(&iter, &outer)) {
+ if (!BSON_ITER_HOLDS_DOCUMENT(&child) || !bson_iter_recurse(&child, &outer)) {
continue;
}
if (!bson_iter_find(&outer, "index") || !BSON_ITER_HOLDS_INT32(&outer)) {
continue;
}
index = bson_iter_int32(&outer);
if (!bson_iter_find(&outer, "_id")) {
continue;
}
if (BSON_ITER_HOLDS_OID(&outer)) {
#if PHP_VERSION_ID >= 70000
zval zid;
php_phongo_objectid_new_from_oid(&zid, bson_iter_oid(&outer) TSRMLS_CC);
add_index_zval(return_value, index, &zid);
#else
zval *zid = NULL;
MAKE_STD_ZVAL(zid);
php_phongo_objectid_new_from_oid(zid, bson_iter_oid(&outer) TSRMLS_CC);
add_index_zval(return_value, index, zid);
#endif
} else if (BSON_ITER_HOLDS_INT32(&outer)) {
int32_t val = bson_iter_int32(&outer);
add_index_long(return_value, index, val);
} else if (BSON_ITER_HOLDS_INT64(&outer)) {
int64_t val = bson_iter_int64(&outer);
ADD_INDEX_INT64(return_value, index, val);
}
}
}
}
/* }}} */
/* {{{ proto WriteConcernError WriteResult::getWriteConcernError()
Return any write concern error that occurred */
PHP_METHOD(WriteResult, getWriteConcernError)
{
+ bson_iter_t iter, child;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
-
- if (!bson_empty0(&intern->write_result.writeConcernErrors)) {
- bson_iter_t iter;
-
- bson_iter_init(&iter, &intern->write_result.writeConcernErrors);
-
- while (bson_iter_next(&iter)) {
+ if (bson_iter_init_find(&iter, intern->reply, "writeConcernErrors") && BSON_ITER_HOLDS_ARRAY(&iter) && bson_iter_recurse(&iter, &child)) {
+ while (bson_iter_next(&child)) {
bson_t cbson;
uint32_t len;
const uint8_t *data;
- if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
+ if (!BSON_ITER_HOLDS_DOCUMENT(&child)) {
continue;
}
- bson_iter_document(&iter, &len, &data);
+ bson_iter_document(&child, &len, &data);
if (!bson_init_static(&cbson, data, len)) {
continue;
}
object_init_ex(return_value, php_phongo_writeconcernerror_ce);
if (!phongo_writeconcernerror_init(return_value, &cbson TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zval_ptr_dtor(return_value);
#else
zval_ptr_dtor(&return_value);
#endif
}
return;
}
}
}
/* }}} */
/* {{{ proto WriteError[] WriteResult::getWriteErrors()
Returns any write errors that occurred */
PHP_METHOD(WriteResult, getWriteErrors)
{
+ bson_iter_t iter, child;
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
- if (!bson_empty0(&intern->write_result.writeErrors)) {
- bson_iter_t iter;
-
- bson_iter_init(&iter, &intern->write_result.writeErrors);
-
- while (bson_iter_next(&iter)) {
+ if (bson_iter_init_find(&iter, intern->reply, "writeErrors") && BSON_ITER_HOLDS_ARRAY(&iter) && bson_iter_recurse(&iter, &child)) {
+ while (bson_iter_next(&child)) {
bson_t cbson;
uint32_t len;
const uint8_t *data;
#if PHP_VERSION_ID >= 70000
zval writeerror;
#else
zval *writeerror = NULL;
#endif
- if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
+ if (!BSON_ITER_HOLDS_DOCUMENT(&child)) {
continue;
}
- bson_iter_document(&iter, &len, &data);
+ bson_iter_document(&child, &len, &data);
if (!bson_init_static(&cbson, data, len)) {
continue;
}
#if PHP_VERSION_ID >= 70000
object_init_ex(&writeerror, php_phongo_writeerror_ce);
if (!phongo_writeerror_init(&writeerror, &cbson TSRMLS_CC)) {
zval_ptr_dtor(&writeerror);
continue;
}
add_next_index_zval(return_value, &writeerror);
#else
MAKE_STD_ZVAL(writeerror);
object_init_ex(writeerror, php_phongo_writeerror_ce);
if (!phongo_writeerror_init(writeerror, &cbson TSRMLS_CC)) {
zval_ptr_dtor(&writeerror);
continue;
}
add_next_index_zval(return_value, writeerror);
#endif
}
}
}
/* }}} */
/* {{{ proto boolean WriteResult::isAcknowledged()
Returns the number of documents that were upserted */
PHP_METHOD(WriteResult, isAcknowledged)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_BOOL(_mongoc_write_concern_needs_gle(intern->write_concern));
}
/* }}} */
/**
* Result returned by Server and Manager executeBulkWrite() methods.
*
* This class may be constructed internally if it will encapsulate a libmongoc
* data structure.
*/
/* {{{ MongoDB\Driver\WriteResult */
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getInsertedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getMatchedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getModifiedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getDeletedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getUpsertedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getServer, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getUpsertedIds, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getWriteConcernError, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getWriteErrors, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_isAcknowledged, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_writeresult_me[] = {
PHP_ME(Server, __construct, NULL, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
PHP_ME(WriteResult, getInsertedCount, ai_WriteResult_getInsertedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getMatchedCount, ai_WriteResult_getMatchedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getModifiedCount, ai_WriteResult_getModifiedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getDeletedCount, ai_WriteResult_getDeletedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getUpsertedCount, ai_WriteResult_getUpsertedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getServer, ai_WriteResult_getServer, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getUpsertedIds, ai_WriteResult_getUpsertedIds, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getWriteConcernError, ai_WriteResult_getWriteConcernError, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getWriteErrors, ai_WriteResult_getWriteErrors, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, isAcknowledged, ai_WriteResult_isAcknowledged, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_writeresult_t object handlers */
static void php_phongo_writeresult_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern = Z_OBJ_WRITERESULT(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
- _mongoc_write_result_destroy(&intern->write_result);
+ if (intern->reply) {
+ bson_destroy(intern->reply);
+ }
if (intern->write_concern) {
mongoc_write_concern_destroy(intern->write_concern);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_writeresult_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_writeresult_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_writeresult;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_writeresult_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_writeresult;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
- php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
- bson_iter_t iter;
+ bson_iter_t iter, child;
intern = Z_WRITERESULT_OBJ_P(object);
*is_temp = 1;
array_init_size(&retval, 9);
- ADD_ASSOC_LONG_EX(&retval, "nInserted", intern->write_result.nInserted);
- ADD_ASSOC_LONG_EX(&retval, "nMatched", intern->write_result.nMatched);
- if (intern->write_result.omit_nModified) {
- ADD_ASSOC_NULL_EX(&retval, "nModified");
- } else {
- ADD_ASSOC_LONG_EX(&retval, "nModified", intern->write_result.nModified);
+#define SCP(field) \
+ if (bson_iter_init_find(&iter, intern->reply, (field)) && BSON_ITER_HOLDS_INT32(&iter)) { \
+ ADD_ASSOC_LONG_EX(&retval, (field), bson_iter_int32(&iter)); \
+ } else { \
+ ADD_ASSOC_NULL_EX(&retval, (field)); \
}
- ADD_ASSOC_LONG_EX(&retval, "nRemoved", intern->write_result.nRemoved);
- ADD_ASSOC_LONG_EX(&retval, "nUpserted", intern->write_result.nUpserted);
- /* Use native arrays for debugging output */
- state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+ SCP("nInserted");
+ SCP("nMatched");
+ SCP("nModified");
+ SCP("nRemoved");
+ SCP("nUpserted");
+#undef SCP
- phongo_bson_to_zval_ex(bson_get_data(&intern->write_result.upserted), intern->write_result.upserted.len, &state);
+ if (bson_iter_init_find(&iter, intern->reply, "upserted") && BSON_ITER_HOLDS_ARRAY(&iter)) {
+ uint32_t len;
+ const uint8_t *data;
+ php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
+
+ /* Use native arrays for debugging output */
+ state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+ state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+
+ bson_iter_array(&iter, &len, &data);
+ phongo_bson_to_zval_ex(data, len, &state);
+#if PHP_VERSION_ID >= 70000
+ ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", &state.zchild);
+#else
+ ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", state.zchild);
+#endif
+ } else {
#if PHP_VERSION_ID >= 70000
- ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", &state.zchild);
+ zval upsertedIds;
+ array_init(&upsertedIds);
+ ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", &upsertedIds);
#else
- ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", state.zchild);
+ zval *upsertedIds = NULL;
+ MAKE_STD_ZVAL(upsertedIds);
+ array_init(upsertedIds);
+ ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", upsertedIds);
#endif
+ }
+
+ if (bson_iter_init_find(&iter, intern->reply, "writeErrors") && BSON_ITER_HOLDS_ARRAY(&iter)) {
+ uint32_t len;
+ const uint8_t *data;
+ php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
+
+ /* Use native arrays for debugging output */
+ state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+ state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- phongo_bson_to_zval_ex(bson_get_data(&intern->write_result.writeErrors), intern->write_result.writeErrors.len, &state);
+ bson_iter_array(&iter, &len, &data);
+ phongo_bson_to_zval_ex(data, len, &state);
+#if PHP_VERSION_ID >= 70000
+ ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", &state.zchild);
+#else
+ ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", state.zchild);
+#endif
+ } else {
#if PHP_VERSION_ID >= 70000
- ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", &state.zchild);
+ zval writeErrors;
+ array_init(&writeErrors);
+ ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", &writeErrors);
#else
- ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", state.zchild);
+ zval *writeErrors = NULL;
+ MAKE_STD_ZVAL(writeErrors);
+ array_init(writeErrors);
+ ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", writeErrors);
#endif
+ }
- if (!bson_empty0(&intern->write_result.writeConcernErrors) &&
- bson_iter_init(&iter, &intern->write_result.writeConcernErrors) &&
- bson_iter_next(&iter) &&
- BSON_ITER_HOLDS_DOCUMENT(&iter)) {
+ if (bson_iter_init_find(&iter, intern->reply, "writeConcernErrors") && BSON_ITER_HOLDS_ARRAY(&iter) &&
+ bson_iter_recurse(&iter, &child) && bson_iter_next(&child) && BSON_ITER_HOLDS_DOCUMENT(&child)) {
uint32_t len;
const uint8_t *data;
+ php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
- bson_iter_document(&iter, &len, &data);
+ /* Use native arrays for debugging output */
+ state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+ state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
+ bson_iter_document(&child, &len, &data);
phongo_bson_to_zval_ex(data, len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "writeConcernError", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(&retval, "writeConcernError", state.zchild);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "writeConcernError");
}
if (intern->write_concern) {
#if PHP_VERSION_ID >= 70000
zval write_concern;
php_phongo_write_concern_to_zval(&write_concern, intern->write_concern);
+ ADD_ASSOC_ZVAL_EX(&retval, "writeConcern", &write_concern);
#else
zval *write_concern = NULL;
MAKE_STD_ZVAL(write_concern);
php_phongo_write_concern_to_zval(write_concern, intern->write_concern);
-#endif
-#if PHP_VERSION_ID >= 70000
- ADD_ASSOC_ZVAL_EX(&retval, "writeConcern", &write_concern);
-#else
ADD_ASSOC_ZVAL_EX(&retval, "writeConcern", write_concern);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "writeConcern");
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(WriteResult)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteResult", php_phongo_writeresult_me);
php_phongo_writeresult_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_writeresult_ce->create_object = php_phongo_writeresult_create_object;
PHONGO_CE_INIT(php_phongo_writeresult_ce);
memcpy(&php_phongo_handler_writeresult, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_writeresult.get_debug_info = php_phongo_writeresult_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_writeresult.free_obj = php_phongo_writeresult_free_object;
php_phongo_handler_writeresult.offset = XtOffsetOf(php_phongo_writeresult_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/src/bson.c b/mongodb-1.1.6/src/bson.c
similarity index 99%
rename from mongodb-1.1.5/src/bson.c
rename to mongodb-1.1.6/src/bson.c
index 8ba3840c..cedde7ba 100644
--- a/mongodb-1.1.5/src/bson.c
+++ b/mongodb-1.1.6/src/bson.c
@@ -1,1650 +1,1650 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 2014-2015 Hannes Magnusson |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Hannes Magnusson <bjori@php.net> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
/* PHP Core stuff */
#include <php.h>
#include <ext/spl/spl_array.h>
#include <Zend/zend_hash.h>
#include <Zend/zend_interfaces.h>
/* PHP array helpers */
#include "php_array_api.h"
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
#if SIZEOF_PHONGO_LONG == 8
# define BSON_APPEND_INT(b, key, keylen, val) \
if (val > INT32_MAX || val < INT32_MIN) { \
bson_append_int64(b, key, keylen, val); \
} else { \
bson_append_int32(b, key, keylen, val); \
}
#elif SIZEOF_PHONGO_LONG == 4
# define BSON_APPEND_INT(b, key, keylen, val) \
bson_append_int32(b, key, keylen, val)
#else
# error Unsupported architecture (integers are neither 32-bit nor 64-bit)
#endif
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "PHONGO-BSON"
#define PHONGO_ODM_FIELD_NAME "__pclass"
#define PHONGO_IS_CLASS_INSTANTIATABLE(ce) \
(!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)))
PHP_MINIT_FUNCTION(bson)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
(void)module_number; /* Really doesn't matter which module number we are */
/* Register BSONable */
return SUCCESS;
}
/* Forward declarations */
bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data);
bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data);
/* {{{ Santa's Little Helper: Object getters */
void php_phongo_objectid_get_id(zval *object, bson_oid_t *oid TSRMLS_DC)
{
php_phongo_objectid_t *intern;
intern = Z_OBJECTID_OBJ_P(object);
bson_oid_init_from_string(oid, intern->oid);
}
int64_t php_phongo_utcdatetime_get_milliseconds(zval *object TSRMLS_DC)
{
php_phongo_utcdatetime_t *intern;
intern = Z_UTCDATETIME_OBJ_P(object);
return intern->milliseconds;
}
uint32_t php_phongo_timestamp_get_increment(zval *object TSRMLS_DC)
{
php_phongo_timestamp_t *intern;
intern = Z_TIMESTAMP_OBJ_P(object);
return intern->increment;
}
uint32_t php_phongo_timestamp_get_timestamp(zval *object TSRMLS_DC)
{
php_phongo_timestamp_t *intern;
intern = Z_TIMESTAMP_OBJ_P(object);
return intern->timestamp;
}
bool php_phongo_javascript_has_scope(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return !!intern->document;
}
char *php_phongo_javascript_get_javascript(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return intern->javascript;
}
bson_t *php_phongo_javascript_get_scope(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return intern->document;
}
int php_phongo_binary_get_data(zval *object, char **data TSRMLS_DC)
{
php_phongo_binary_t *intern;
intern = Z_BINARY_OBJ_P(object);
*data = intern->data;
return intern->data_len;
}
uint8_t php_phongo_binary_get_type(zval *object TSRMLS_DC)
{
php_phongo_binary_t *intern;
intern = Z_BINARY_OBJ_P(object);
return intern->type;
}
char *php_phongo_regex_get_pattern(zval *object TSRMLS_DC)
{
php_phongo_regex_t *intern;
intern = Z_REGEX_OBJ_P(object);
return intern->pattern;
}
char *php_phongo_regex_get_flags(zval *object TSRMLS_DC)
{
php_phongo_regex_t *intern;
intern = Z_REGEX_OBJ_P(object);
return intern->flags;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_before(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
return false;
}
/* }}} */
bool php_phongo_bson_visit_after(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
return false;
}
/* }}} */
#endif
void php_phongo_bson_visit_corrupt(const bson_iter_t *iter ARG_UNUSED, void *data ARG_UNUSED) /* {{{ */
{
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "Corrupt BSON data detected!");
}
/* }}} */
bool php_phongo_bson_visit_double(const bson_iter_t *iter ARG_UNUSED, const char *key, double v_double, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_double(retval, key, v_double);
return false;
}
/* }}} */
bool php_phongo_bson_visit_utf8(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_utf8_len, const char *v_utf8, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
ADD_ASSOC_STRING_EX(retval, key, strlen(key), (char *)v_utf8, v_utf8_len);
return false;
}
/* }}} */
bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, const char *key, bson_subtype_t v_subtype, size_t v_binary_len, const uint8_t *v_binary, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
TSRMLS_FETCH();
if (v_subtype == 0x80 && strcmp(key, PHONGO_ODM_FIELD_NAME) == 0) {
#if PHP_VERSION_ID >= 70000
zend_string *zs_classname = zend_string_init((const char *)v_binary, v_binary_len, 0);
zend_class_entry *found_ce = zend_fetch_class(zs_classname, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
zend_string_free(zs_classname);
#else
zend_class_entry *found_ce = zend_fetch_class((char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
#endif
if (found_ce && PHONGO_IS_CLASS_INSTANTIATABLE(found_ce) && instanceof_function(found_ce, php_phongo_persistable_ce TSRMLS_CC)) {
((php_phongo_bson_state *)data)->odm = found_ce;
}
}
{
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_binary_from_binary_and_type(&zchild, (const char *)v_binary, v_binary_len, v_subtype TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
Z_SET_REFCOUNT(zchild, 1);
#else
zval *zchild = NULL;
MAKE_STD_ZVAL(zchild);
php_phongo_new_binary_from_binary_and_type(zchild, (const char *)v_binary, v_binary_len, v_subtype TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
}
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_undefined(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_oid(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_oid_t *v_oid, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_objectid_new_from_oid(&zchild, v_oid TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_objectid_new_from_oid(zchild, v_oid TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_bool(const bson_iter_t *iter ARG_UNUSED, const char *key, bool v_bool, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_bool(retval, key, v_bool);
return false;
}
/* }}} */
bool php_phongo_bson_visit_date_time(const bson_iter_t *iter ARG_UNUSED, const char *key, int64_t msec_since_epoch, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_utcdatetime_from_epoch(&zchild, msec_since_epoch TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_utcdatetime_from_epoch(zchild, msec_since_epoch TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_null(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_null(retval, key);
return false;
}
/* }}} */
bool php_phongo_bson_visit_regex(const bson_iter_t *iter ARG_UNUSED, const char *key, const char *v_regex, const char *v_options, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_regex_from_regex_and_options(&zchild, v_regex, v_options TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_regex_from_regex_and_options(zchild, v_regex, v_options TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_dbpointer(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_collection_len, const char *v_collection, const bson_oid_t *v_oid, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_code(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_code_len, const char *v_code, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_javascript_from_javascript(1, &zchild, v_code, v_code_len TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_javascript_from_javascript(1, zchild, v_code, v_code_len TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_symbol(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_symbol_len, const char *v_symbol, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_codewscope(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_code_len, const char *v_code, const bson_t *v_scope, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_javascript_from_javascript_and_scope(1, &zchild, v_code, v_code_len, v_scope TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_javascript_from_javascript_and_scope(1, zchild, v_code, v_code_len, v_scope TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_int32(const bson_iter_t *iter ARG_UNUSED, const char *key, int32_t v_int32, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_long(retval, key, v_int32);
return false;
}
/* }}} */
bool php_phongo_bson_visit_timestamp(const bson_iter_t *iter ARG_UNUSED, const char *key, uint32_t v_timestamp, uint32_t v_increment, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_timestamp_from_increment_and_timestamp(&zchild, v_increment, v_timestamp TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_timestamp_from_increment_and_timestamp(zchild, v_increment, v_timestamp TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_int64(const bson_iter_t *iter ARG_UNUSED, const char *key, int64_t v_int64, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
ADD_ASSOC_INT64(retval, key, v_int64);
return false;
}
/* }}} */
bool php_phongo_bson_visit_maxkey(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
object_init_ex(&zchild, php_phongo_maxkey_ce);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
object_init_ex(zchild, php_phongo_maxkey_ce);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_minkey(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
object_init_ex(&zchild, php_phongo_minkey_ce);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
object_init_ex(zchild, php_phongo_minkey_ce);
Z_SET_REFCOUNT_P(zchild, 1);
ADD_ASSOC_ZVAL(retval, key, zchild);
#endif
return false;
}
/* }}} */
static const bson_visitor_t php_bson_visitors = {
NULL /* php_phongo_bson_visit_before*/,
NULL /*php_phongo_bson_visit_after*/,
php_phongo_bson_visit_corrupt,
php_phongo_bson_visit_double,
php_phongo_bson_visit_utf8,
php_phongo_bson_visit_document,
php_phongo_bson_visit_array,
php_phongo_bson_visit_binary,
NULL /*php_phongo_bson_visit_undefined*/,
php_phongo_bson_visit_oid,
php_phongo_bson_visit_bool,
php_phongo_bson_visit_date_time,
php_phongo_bson_visit_null,
php_phongo_bson_visit_regex,
NULL /*php_phongo_bson_visit_dbpointer*/,
php_phongo_bson_visit_code,
NULL /*php_phongo_bson_visit_symbol*/,
php_phongo_bson_visit_codewscope,
php_phongo_bson_visit_int32,
php_phongo_bson_visit_timestamp,
php_phongo_bson_visit_int64,
php_phongo_bson_visit_maxkey,
php_phongo_bson_visit_minkey,
{ NULL }
};
bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data)
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
bson_iter_t child;
TSRMLS_FETCH();
if (bson_iter_init(&child, v_document)) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map = ((php_phongo_bson_state *)data)->map;
#if PHP_VERSION_ID >= 70000
array_init(&state.zchild);
#else
MAKE_STD_ZVAL(state.zchild);
array_init(state.zchild);
#endif
if (!bson_iter_visit_all(&child, &php_bson_visitors, &state) && !child.err_off) {
/* If php_phongo_bson_visit_binary() finds an ODM class, it should
* supersede a default type map and named document class. */
if (state.odm && state.map.document_type == PHONGO_TYPEMAP_NONE) {
state.map.document_type = PHONGO_TYPEMAP_CLASS;
}
switch(state.map.document_type) {
case PHONGO_TYPEMAP_NATIVE_ARRAY:
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
ADD_ASSOC_ZVAL(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state.odm ? state.odm : state.map.document);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state.zchild);
add_assoc_zval(retval, key, &obj);
zval_ptr_dtor(&state.zchild);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state.odm ? state.odm : state.map.document);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state.zchild);
add_assoc_zval(retval, key, obj);
zval_ptr_dtor(&state.zchild);
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
default:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state.zchild, zend_standard_class_def, Z_ARRVAL(state.zchild));
add_assoc_zval(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
add_assoc_zval(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
}
} else {
/* Iteration stopped prematurely due to corruption or a failed
* visitor. Free state.zchild, which we just initialized, and return
* true to stop iteration for our parent context. */
zval_ptr_dtor(&state.zchild);
return true;
}
}
return false;
}
bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_array, void *data)
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
bson_iter_t child;
TSRMLS_FETCH();
if (bson_iter_init(&child, v_array)) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map = ((php_phongo_bson_state *)data)->map;
#if PHP_VERSION_ID >= 70000
array_init(&state.zchild);
#else
MAKE_STD_ZVAL(state.zchild);
array_init(state.zchild);
#endif
if (!bson_iter_visit_all(&child, &php_bson_visitors, &state) && !child.err_off) {
switch(state.map.array_type) {
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state.map.array);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state.zchild);
add_assoc_zval(retval, key, &obj);
zval_ptr_dtor(&state.zchild);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state.map.array);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state.zchild);
add_assoc_zval(retval, key, obj);
zval_ptr_dtor(&state.zchild);
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state.zchild, zend_standard_class_def, Z_ARRVAL(state.zchild));
add_assoc_zval(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
add_assoc_zval(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
case PHONGO_TYPEMAP_NATIVE_ARRAY:
default:
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
ADD_ASSOC_ZVAL(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
}
} else {
/* Iteration stopped prematurely due to corruption or a failed
* visitor. Free state.zchild, which we just initialized, and return
* true to stop iteration for our parent context. */
zval_ptr_dtor(&state.zchild);
return true;
}
}
return false;
}
int php_phongo_is_array_or_document(zval *val TSRMLS_DC) /* {{{ */
{
HashTable *ht_data = HASH_OF(val);
int count;
if (Z_TYPE_P(val) != IS_ARRAY) {
return IS_OBJECT;
}
count = ht_data ? zend_hash_num_elements(ht_data) : 0;
if (count > 0) {
#if PHP_VERSION_ID >= 70000
zend_string *key;
zend_ulong index, idx;
idx = 0;
ZEND_HASH_FOREACH_KEY(ht_data, index, key) {
if (key) {
return IS_OBJECT;
} else {
if (index != idx) {
return IS_OBJECT;
}
}
idx++;
} ZEND_HASH_FOREACH_END();
#else
char *key;
unsigned int key_len;
unsigned long index = 0;
unsigned long idx = 0;
int hash_type = 0;
HashPosition pos;
zend_hash_internal_pointer_reset_ex(ht_data, &pos);
for (;; zend_hash_move_forward_ex(ht_data, &pos)) {
hash_type = zend_hash_get_current_key_ex(ht_data, &key, &key_len, &index, 0, &pos);
if (hash_type == HASH_KEY_NON_EXISTENT) {
break;
}
if (hash_type == HASH_KEY_IS_STRING) {
return IS_OBJECT;
} else {
if (index != idx) {
return IS_OBJECT;
}
}
idx++;
}
#endif
} else {
return Z_TYPE_P(val);
}
return IS_ARRAY;
}
/* }}} */
void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key, long key_len, bson_t *bson TSRMLS_DC)
{
bson_t child;
if (Z_TYPE_P(object) == IS_OBJECT && instanceof_function(Z_OBJCE_P(object), php_phongo_type_ce TSRMLS_CC)) {
if (instanceof_function(Z_OBJCE_P(object), php_phongo_serializable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zval obj_data;
#else
zval *obj_data = NULL;
#endif
bson_t child;
HashTable *tmp_ht;
#if PHP_VERSION_ID >= 70000
zend_call_method_with_0_params(object, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#else
zend_call_method_with_0_params(&object, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#endif
if (Z_ISUNDEF(obj_data)) {
/* zend_call_method() failed */
return;
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE(obj_data) != IS_ARRAY && !(Z_TYPE(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE(obj_data), zend_standard_class_def TSRMLS_CC))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
Z_OBJCE_P(object)->name->val,
BSON_SERIALIZE_FUNC_NAME,
(Z_TYPE(obj_data) == IS_OBJECT
? Z_OBJCE(obj_data)->name->val
: zend_get_type_by_const(Z_TYPE(obj_data))
)
);
zval_ptr_dtor(&obj_data);
#else
if (Z_TYPE_P(obj_data) != IS_ARRAY && !(Z_TYPE_P(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(obj_data), zend_standard_class_def TSRMLS_CC))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
Z_OBJCE_P(object)->name,
BSON_SERIALIZE_FUNC_NAME,
(Z_TYPE_P(obj_data) == IS_OBJECT
? Z_OBJCE_P(obj_data)->name
: zend_get_type_by_const(Z_TYPE_P(obj_data))
)
);
zval_ptr_dtor(&obj_data);
#endif
return;
}
#if PHP_VERSION_ID >= 70000
tmp_ht = HASH_OF(&obj_data);
#else
tmp_ht = HASH_OF(obj_data);
#endif
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)++;
}
/* Persistable objects must always be serialized as BSON documents;
* otherwise, infer based on bsonSerialize()'s return value. */
#if PHP_VERSION_ID >= 70000
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC) || php_phongo_is_array_or_document(&obj_data TSRMLS_CC) == IS_OBJECT) {
#else
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC) || php_phongo_is_array_or_document(obj_data TSRMLS_CC) == IS_OBJECT) {
#endif
bson_append_document_begin(bson, key, key_len, &child);
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name->val, Z_OBJCE_P(object)->name->len);
#else
bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name, strlen(Z_OBJCE_P(object)->name));
#endif
}
#if PHP_VERSION_ID >= 70000
phongo_zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
#else
phongo_zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
#endif
bson_append_document_end(bson, &child);
} else {
bson_append_array_begin(bson, key, key_len, &child);
#if PHP_VERSION_ID >= 70000
phongo_zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
#else
phongo_zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
#endif
bson_append_array_end(bson, &child);
}
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)--;
}
zval_ptr_dtor(&obj_data);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_objectid_ce TSRMLS_CC)) {
bson_oid_t oid;
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectId");
php_phongo_objectid_get_id(object, &oid TSRMLS_CC);
bson_append_oid(bson, key, key_len, &oid);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_utcdatetime_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding UTCDateTime");
bson_append_date_time(bson, key, key_len, php_phongo_utcdatetime_get_milliseconds(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_binary_ce TSRMLS_CC)) {
const unsigned char *data;
size_t data_len;
data_len = php_phongo_binary_get_data(object, (char **)&data TSRMLS_CC);
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Binary");
bson_append_binary(bson, key, key_len, php_phongo_binary_get_type(object TSRMLS_CC), data, data_len);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_regex_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Regex");
bson_append_regex(bson, key, key_len, php_phongo_regex_get_pattern(object TSRMLS_CC), php_phongo_regex_get_flags(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_javascript_ce TSRMLS_CC)) {
if (php_phongo_javascript_has_scope(object TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Javascript with scope");
bson_append_code(bson, key, key_len, php_phongo_javascript_get_javascript(object TSRMLS_CC));
} else {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Javascript without scope");
bson_append_code_with_scope(bson, key, key_len, php_phongo_javascript_get_javascript(object TSRMLS_CC), php_phongo_javascript_get_scope(object TSRMLS_CC));
}
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_timestamp_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Timestamp");
/*
* WHOOPS! libbson swaps the increment/timestamp compared to BSON
*
* "Timestamp - Special internal type used by MongoDB replication and sharding.
* First 4 bytes are an increment, second 4 are a timestamp."
*/
bson_append_timestamp(bson, key, key_len, php_phongo_timestamp_get_timestamp(object TSRMLS_CC), php_phongo_timestamp_get_increment(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_maxkey_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding MaxKey");
bson_append_maxkey(bson, key, key_len);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_minkey_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding MinKey");
bson_append_minkey(bson, key, key_len);
return;
}
#if PHP_VERSION_ID >= 70000
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(object)->name));
#else
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", php_phongo_type_ce->name, Z_OBJCE_P(object)->name);
#endif
return;
}
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding document");
bson_append_document_begin(bson, key, key_len, &child);
phongo_zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
bson_append_document_end(bson, &child);
}
static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, zval *entry TSRMLS_DC)
{
#if PHP_VERSION_ID >= 70000
try_again:
#endif
switch (Z_TYPE_P(entry))
{
case IS_NULL:
bson_append_null(bson, key, key_len);
break;
#if PHP_VERSION_ID >= 70000
case IS_TRUE:
bson_append_bool(bson, key, key_len, true);
break;
case IS_FALSE:
bson_append_bool(bson, key, key_len, false);
break;
#else
case IS_BOOL:
bson_append_bool(bson, key, key_len, Z_BVAL_P(entry));
break;
#endif
case IS_LONG:
BSON_APPEND_INT(bson, key, key_len, Z_LVAL_P(entry));
break;
case IS_DOUBLE:
bson_append_double(bson, key, key_len, Z_DVAL_P(entry));
break;
case IS_STRING:
if (bson_utf8_validate(Z_STRVAL_P(entry), Z_STRLEN_P(entry), true)) {
bson_append_utf8(bson, key, key_len, Z_STRVAL_P(entry), Z_STRLEN_P(entry));
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got invalid UTF-8 value serializing '%s'", Z_STRVAL_P(entry));
}
break;
case IS_ARRAY:
if (php_phongo_is_array_or_document(entry TSRMLS_CC) == IS_ARRAY) {
bson_t child;
HashTable *tmp_ht = HASH_OF(entry);
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)++;
}
bson_append_array_begin(bson, key, key_len, &child);
phongo_zval_to_bson(entry, flags, &child, NULL TSRMLS_CC);
bson_append_array_end(bson, &child);
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)--;
}
break;
}
/* break intentionally omitted */
case IS_OBJECT:
object_to_bson(entry, flags, key, key_len, bson TSRMLS_CC);
break;
#if PHP_VERSION_ID >= 70000
case IS_INDIRECT:
phongo_bson_append(bson, flags, key, key_len, Z_INDIRECT_P(entry) TSRMLS_DC);
break;
case IS_REFERENCE:
ZVAL_DEREF(entry);
goto try_again;
#endif
default:
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got unsupported type %d '%s'", Z_TYPE_P(entry), zend_get_type_by_const(Z_TYPE_P(entry)));
}
}
#if PHP_VERSION_ID >= 70000
static bool is_public_property(zend_class_entry *ce, zend_string *name, zend_string **member TSRMLS_DC) /* {{{ */
#else
static bool is_public_property(zend_class_entry *ce, const char *prop_name, int prop_name_len TSRMLS_DC) /* {{{ */
#endif
{
zend_property_info *property_info = NULL;
#if PHP_VERSION_ID >= 70000
if (ZSTR_VAL(name)[0] == 0) {
const char *prop_name,
*class_name;
size_t prop_name_len;
zend_unmangle_property_name_ex(name,
&class_name, &prop_name, &prop_name_len);
(*member) = zend_string_init(prop_name, prop_name_len, 0);
} else (*member) = zend_string_copy(name);
property_info = zend_get_property_info(ce, (*member), 1 TSRMLS_CC);
if (!property_info) /* undefined property */
return true;
if (property_info == ZEND_WRONG_PROPERTY_INFO) {
return false;
}
return (property_info->flags & ZEND_ACC_PUBLIC);
#else
zval member;
ZVAL_STRINGL(&member, prop_name, prop_name_len, 0);
property_info = zend_get_property_info(ce, &member, 1 TSRMLS_CC);
return (property_info && (property_info->flags & ZEND_ACC_PUBLIC));
#endif
}
/* }}} */
PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
{
HashTable *ht_data = NULL;
#if PHP_VERSION_ID >= 70000
zval obj_data;
#else
HashPosition pos;
zval *obj_data = NULL;
#endif
/* If we will be encoding a class that may contain protected and private
* properties, we'll need to filter them out later. */
bool ht_data_from_properties = false;
switch(Z_TYPE_P(data)) {
case IS_OBJECT:
if (instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zend_call_method_with_0_params(data, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#else
zend_call_method_with_0_params(&data, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#endif
if (Z_ISUNDEF(obj_data)) {
/* zend_call_method() failed */
break;
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE(obj_data) != IS_ARRAY && !(Z_TYPE(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE(obj_data), zend_standard_class_def TSRMLS_CC))) {
#else
if (Z_TYPE_P(obj_data) != IS_ARRAY && !(Z_TYPE_P(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(obj_data), zend_standard_class_def TSRMLS_CC))) {
#endif
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
#if PHP_VERSION_ID >= 70000
Z_OBJCE_P(data)->name->val,
#else
Z_OBJCE_P(data)->name,
#endif
BSON_SERIALIZE_FUNC_NAME,
#if PHP_VERSION_ID >= 70000
(Z_TYPE(obj_data) == IS_OBJECT
? Z_OBJCE(obj_data)->name->val
: zend_get_type_by_const(Z_TYPE(obj_data))
#else
(Z_TYPE_P(obj_data) == IS_OBJECT
? Z_OBJCE_P(obj_data)->name
: zend_get_type_by_const(Z_TYPE_P(obj_data))
#endif
)
);
break;
}
#if PHP_VERSION_ID >= 70000
ht_data = HASH_OF(&obj_data);
#else
ht_data = HASH_OF(obj_data);
#endif
if (instanceof_function(Z_OBJCE_P(data), php_phongo_persistable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
bson_append_binary(bson, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name->val, Z_OBJCE_P(data)->name->len);
zend_hash_str_del(ht_data, PHONGO_ODM_FIELD_NAME, sizeof(PHONGO_ODM_FIELD_NAME)-1);
#else
bson_append_binary(bson, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name, strlen(Z_OBJCE_P(data)->name));
zend_hash_del(ht_data, PHONGO_ODM_FIELD_NAME, sizeof(PHONGO_ODM_FIELD_NAME));
#endif
}
break;
}
if (instanceof_function(Z_OBJCE_P(data), php_phongo_type_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(data)->name));
#else
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", php_phongo_type_ce->name, Z_OBJCE_P(data)->name);
#endif
break;
}
ht_data = Z_OBJ_HT_P(data)->get_properties(data TSRMLS_CC);
ht_data_from_properties = true;
break;
case IS_ARRAY:
ht_data = HASH_OF(data);
break;
default:
return;
}
if (!ht_data || ZEND_HASH_APPLY_COUNT(ht_data) > 1) {
#if PHP_VERSION_ID >= 70000
if (Z_TYPE_P(data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#endif
if (!Z_ISUNDEF(obj_data)) {
zval_ptr_dtor(&obj_data);
}
#if PHP_VERSION_ID >= 70000
}
#endif
return;
}
#if PHP_VERSION_ID >= 70000
{
zend_string *string_key = NULL;
zend_ulong num_key = 0;
zval *value;
ZEND_HASH_FOREACH_KEY_VAL(ht_data, num_key, string_key, value) {
/* Ensure we're working with a string key */
if (!string_key) {
string_key = zend_long_to_str(num_key);
} else {
zend_string_addref(string_key);
}
if (Z_TYPE_P(data) == IS_OBJECT) {
zend_string *member = NULL;
/* Ignore non-public properties */
if (!instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce) &&
!is_public_property(Z_OBJCE_P(data), string_key, &member TSRMLS_CC)) {
if (member) {
zend_string_release(member);
}
zend_string_release(string_key);
continue;
}
if (flags & PHONGO_BSON_ADD_ID) {
- if (!strncmp(member ? ZSTR_VAL(member) : ZSTR_VAL(string_key), "_id", sizeof("_id")-1)) {
+ if (!strcmp(member ? ZSTR_VAL(member) : ZSTR_VAL(string_key), "_id")) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID,
member ? ZSTR_VAL(member) : ZSTR_VAL(string_key),
member ? ZSTR_LEN(member) : ZSTR_LEN(string_key),
value TSRMLS_CC);
if (member) {
zend_string_release(member);
}
} else {
if (flags & PHONGO_BSON_ADD_ID) {
- if (!strncmp(ZSTR_VAL(string_key), "_id", sizeof("_id")-1)) {
+ if (!strcmp(ZSTR_VAL(string_key), "_id")) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, ZSTR_VAL(string_key), ZSTR_LEN(string_key), value TSRMLS_CC);
}
zend_string_release(string_key);
} ZEND_HASH_FOREACH_END();
}
#else
zend_hash_internal_pointer_reset_ex(ht_data, &pos);
for (;; zend_hash_move_forward_ex(ht_data, &pos)) {
char *string_key = NULL;
uint string_key_len = 0;
ulong num_key = 0;
zval **value;
int hash_type;
hash_type = zend_hash_get_current_key_ex(ht_data, &string_key, &string_key_len, &num_key, 0, &pos);
if (hash_type == HASH_KEY_NON_EXISTENT) {
break;
}
if (zend_hash_get_current_data_ex(ht_data, (void **) &value, &pos) == FAILURE) {
break;
}
if (hash_type == HASH_KEY_IS_STRING) {
if (ht_data_from_properties) {
const char *class_name;
zend_unmangle_property_name(string_key, string_key_len-1, &class_name, (const char **)&string_key);
string_key_len = strlen(string_key);
/* Ignore non-public properties */
if (!is_public_property(Z_OBJCE_P(data), string_key, string_key_len TSRMLS_CC)) {
continue;
}
} else {
/* Chop off the \0 from string lengths */
string_key_len -= 1;
}
if (flags & PHONGO_BSON_ADD_ID) {
- if (!strncmp(string_key, "_id", sizeof("_id")-1)) {
+ if (!strcmp(string_key, "_id")) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
}
/* Ensure we're working with a string key */
if (hash_type == HASH_KEY_IS_LONG) {
spprintf(&string_key, 0, "%ld", num_key);
string_key_len = strlen(string_key);
}
phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, string_key, string_key_len, *value TSRMLS_CC);
if (hash_type == HASH_KEY_IS_LONG) {
efree(string_key);
}
}
#endif
if (flags & PHONGO_BSON_ADD_ID) {
bson_oid_t oid;
bson_oid_init(&oid, NULL);
bson_append_oid(bson, "_id", strlen("_id"), &oid);
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "Added new _id");
if (flags & PHONGO_BSON_RETURN_ID) {
if (bson_out) {
*bson_out = bson_new();
bson_append_oid(*bson_out, "_id", strlen("_id"), &oid);
}
}
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE_P(data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#endif
if (!Z_ISUNDEF(obj_data)) {
zval_ptr_dtor(&obj_data);
}
#if PHP_VERSION_ID >= 70000
}
#endif
}
/* }}} */
#if PHP_VERSION_ID >= 70000
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
#else
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
#endif
{
int retval = 0;
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
retval = phongo_bson_to_zval_ex(data, data_len, &state);
#if PHP_VERSION_ID >= 70000
ZVAL_ZVAL(zv, &state.zchild, 1, 1);
#else
*zv = state.zchild;
#endif
return retval;
}
PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
{
bson_reader_t *reader;
bson_iter_t iter;
const bson_t *b;
bool eof = false;
TSRMLS_FETCH();
#if PHP_VERSION_ID < 70000
MAKE_STD_ZVAL(state->zchild);
/* Ensure that state->zchild has a type, since the calling code may want to
* zval_ptr_dtor() it if we throw an exception. */
ZVAL_NULL(state->zchild);
#endif
reader = bson_reader_new_from_data(data, data_len);
if (!(b = bson_reader_read(reader, NULL))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not read document from BSON reader");
bson_reader_destroy(reader);
return 0;
}
if (!bson_iter_init(&iter, b)) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not initialize BSON iterator");
bson_reader_destroy(reader);
return 0;
}
/* We initialize an array because it will either be returned as-is (native
* array in type map), passed to bsonUnserialize() (ODM class), or used to
* initialize a stdClass object (native object in type map). */
#if PHP_VERSION_ID >= 70000
array_init(&state->zchild);
#else
array_init(state->zchild);
#endif
if (bson_iter_visit_all(&iter, &php_bson_visitors, state) || iter.err_off) {
/* Iteration stopped prematurely due to corruption or a failed visitor.
* While we free the reader, state->zchild should be left as-is, since
* the calling code may want to zval_ptr_dtor() it. */
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not convert BSON document to a PHP variable");
bson_reader_destroy(reader);
return 0;
}
/* If php_phongo_bson_visit_binary() finds an ODM class, it should supersede
* a default type map and named root class. */
if (state->odm && state->map.root_type == PHONGO_TYPEMAP_NONE) {
state->map.root_type = PHONGO_TYPEMAP_CLASS;
}
switch (state->map.root_type) {
case PHONGO_TYPEMAP_NATIVE_ARRAY:
/* Nothing to do here */
break;
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state->odm ? state->odm : state->map.root);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state->zchild);
zval_ptr_dtor(&state->zchild);
ZVAL_COPY_VALUE(&state->zchild, &obj);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state->odm ? state->odm : state->map.root);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state->zchild);
zval_ptr_dtor(&state->zchild);
state->zchild = obj;
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
default:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state->zchild, zend_standard_class_def, Z_ARRVAL(state->zchild));
#else
object_and_properties_init(state->zchild, zend_standard_class_def, Z_ARRVAL_P(state->zchild));
#endif
}
if (bson_reader_read(reader, &eof) || !eof) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Reading document did not exhaust input buffer");
bson_reader_destroy(reader);
return 0;
}
bson_reader_destroy(reader);
return 1;
}
/* {{{ proto string BSON\fromPHP(array|object $value)
Returns the BSON representation of a PHP value */
PHP_FUNCTION(fromPHP)
{
zval *data;
bson_t *bson;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &data) == FAILURE) {
return;
}
bson = bson_new();
phongo_zval_to_bson(data, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC);
PHONGO_RETVAL_STRINGL((const char *) bson_get_data(bson), bson->len);
bson_destroy(bson);
}
/* }}} */
static void apply_classname_to_state(const char *classname, int classname_len, php_phongo_bson_typemap_types *type, zend_class_entry **type_ce TSRMLS_DC)
{
if (!strcasecmp(classname, "array")) {
*type = PHONGO_TYPEMAP_NATIVE_ARRAY;
*type_ce = NULL;
} else if (!strcasecmp(classname, "stdclass") || !strcasecmp(classname, "object")) {
*type = PHONGO_TYPEMAP_NATIVE_OBJECT;
*type_ce = NULL;
} else {
#if PHP_VERSION_ID >= 70000
zend_string* zs_classname = zend_string_init(classname, classname_len, 0);
zend_class_entry *found_ce = zend_fetch_class(zs_classname, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
zend_string_free(zs_classname);
#else
zend_class_entry *found_ce = zend_fetch_class(classname, classname_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
#endif
if (!found_ce) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not exist", classname);
} else if (!PHONGO_IS_CLASS_INSTANTIATABLE(found_ce)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s is not instantiatable", classname);
} else if (!instanceof_function(found_ce, php_phongo_unserializable_ce TSRMLS_CC)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not implement %s\\Unserializable", classname, BSON_NAMESPACE);
} else {
*type = PHONGO_TYPEMAP_CLASS;
*type_ce = found_ce;
}
}
}
PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
{
if (typemap) {
char *classname;
int classname_len;
zend_bool classname_free = 0;
classname = php_array_fetchl_string(typemap, "array", sizeof("array")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->array_type, &map->array TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
classname = php_array_fetchl_string(typemap, "document", sizeof("document")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->document_type, &map->document TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
classname = php_array_fetchl_string(typemap, "root", sizeof("root")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->root_type, &map->root TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
}
}
/* {{{ proto array|object BSON\toPHP(string $bson [, array $typemap = array()])
Returns the PHP representation of a BSON value, optionally converting it into a custom class */
PHP_FUNCTION(toPHP)
{
char *data;
phongo_zpp_char_len data_len;
zval *typemap = NULL;
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!", &data, &data_len, &typemap) == FAILURE) {
return;
}
phongo_bson_typemap_to_state(typemap, &state.map TSRMLS_CC);
if (!phongo_bson_to_zval_ex((const unsigned char *)data, data_len, &state)) {
zval_ptr_dtor(&state.zchild);
RETURN_NULL();
}
#if PHP_VERSION_ID >= 70000
RETURN_ZVAL(&state.zchild, 0, 1);
#else
RETURN_ZVAL(state.zchild, 0, 1);
#endif
}
/* }}} */
/* {{{ proto string BSON\toJSON(string $bson)
Returns the JSON representation of a BSON value */
PHP_FUNCTION(toJSON)
{
char *data;
phongo_zpp_char_len data_len;
const bson_t *b;
bool eof = false;
bson_reader_t *reader;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) {
return;
}
reader = bson_reader_new_from_data((const unsigned char *)data, data_len);
b = bson_reader_read(reader, NULL);
if (b) {
char *str;
size_t str_len;
str = bson_as_json(b, &str_len);
if (!str) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not convert BSON document to a JSON string");
bson_reader_destroy(reader);
return;
}
PHONGO_RETVAL_STRINGL(str, str_len);
bson_free(str);
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not read document from BSON reader");
bson_reader_destroy(reader);
return;
}
if (bson_reader_read(reader, &eof) || !eof) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Reading document did not exhaust input buffer");
}
bson_reader_destroy(reader);
}
/* }}} */
/* {{{ proto string BSON\fromJSON(string $json)
Returns the BSON representation of a JSON value */
PHP_FUNCTION(fromJSON)
{
char *data;
phongo_zpp_char_len data_len;
bson_t b = BSON_INITIALIZER;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) {
return;
}
if (bson_init_from_json(&b, (const char *)data, data_len, &error)) {
PHONGO_RETVAL_STRINGL((const char *) bson_get_data(&b), b.len);
bson_destroy(&b);
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.message ? error.message : "Error parsing JSON");
}
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.5/src/contrib/php-ssl.c b/mongodb-1.1.6/src/contrib/php-ssl.c
similarity index 100%
rename from mongodb-1.1.5/src/contrib/php-ssl.c
rename to mongodb-1.1.6/src/contrib/php-ssl.c
diff --git a/mongodb-1.1.5/src/contrib/php-ssl.h b/mongodb-1.1.6/src/contrib/php-ssl.h
similarity index 100%
rename from mongodb-1.1.5/src/contrib/php-ssl.h
rename to mongodb-1.1.6/src/contrib/php-ssl.h
diff --git a/mongodb-1.1.5/src/contrib/php_array_api.h b/mongodb-1.1.6/src/contrib/php_array_api.h
similarity index 100%
rename from mongodb-1.1.5/src/contrib/php_array_api.h
rename to mongodb-1.1.6/src/contrib/php_array_api.h
diff --git a/mongodb-1.1.6/src/libbson/VERSION_CURRENT b/mongodb-1.1.6/src/libbson/VERSION_CURRENT
new file mode 100644
index 00000000..aaf8be71
--- /dev/null
+++ b/mongodb-1.1.6/src/libbson/VERSION_CURRENT
@@ -0,0 +1 @@
+1.3.5
\ No newline at end of file
diff --git a/mongodb-1.1.6/src/libbson/VERSION_RELEASED b/mongodb-1.1.6/src/libbson/VERSION_RELEASED
new file mode 100644
index 00000000..aaf8be71
--- /dev/null
+++ b/mongodb-1.1.6/src/libbson/VERSION_RELEASED
@@ -0,0 +1 @@
+1.3.5
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/AutoHarden.m4 b/mongodb-1.1.6/src/libbson/build/autotools/AutoHarden.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/AutoHarden.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/AutoHarden.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckAtomics.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckAtomics.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckAtomics.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckAtomics.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckCompiler.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckCompiler.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckCompiler.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckCompiler.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckHeaders.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckHeaders.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckHeaders.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckHeaders.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckHost.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckHost.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckHost.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckHost.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckProgs.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckProgs.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckProgs.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckProgs.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/CheckTarget.m4 b/mongodb-1.1.6/src/libbson/build/autotools/CheckTarget.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/CheckTarget.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/CheckTarget.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/Coverage.m4 b/mongodb-1.1.6/src/libbson/build/autotools/Coverage.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/Coverage.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/Coverage.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/Endian.m4 b/mongodb-1.1.6/src/libbson/build/autotools/Endian.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/Endian.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/Endian.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/FindDependencies.m4 b/mongodb-1.1.6/src/libbson/build/autotools/FindDependencies.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/FindDependencies.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/FindDependencies.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/LDVersionScript.m4 b/mongodb-1.1.6/src/libbson/build/autotools/LDVersionScript.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/LDVersionScript.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/LDVersionScript.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/MaintainerFlags.m4 b/mongodb-1.1.6/src/libbson/build/autotools/MaintainerFlags.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/MaintainerFlags.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/MaintainerFlags.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/Optimizations.m4 b/mongodb-1.1.6/src/libbson/build/autotools/Optimizations.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/Optimizations.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/Optimizations.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/PrintBuildConfiguration.m4 b/mongodb-1.1.6/src/libbson/build/autotools/PrintBuildConfiguration.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/PrintBuildConfiguration.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/PrintBuildConfiguration.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/ReadCommandLineArguments.m4 b/mongodb-1.1.6/src/libbson/build/autotools/ReadCommandLineArguments.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/ReadCommandLineArguments.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/ReadCommandLineArguments.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/SetupAutomake.m4 b/mongodb-1.1.6/src/libbson/build/autotools/SetupAutomake.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/SetupAutomake.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/SetupAutomake.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/SetupLibtool.m4 b/mongodb-1.1.6/src/libbson/build/autotools/SetupLibtool.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/SetupLibtool.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/SetupLibtool.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/Versions.m4 b/mongodb-1.1.6/src/libbson/build/autotools/Versions.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/Versions.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/Versions.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ac_check_typedef.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ac_check_typedef.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ac_check_typedef.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ac_check_typedef.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ac_create_stdint_h.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/as-compiler-flag.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/as-compiler-flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/as-compiler-flag.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/as-compiler-flag.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ax_check_compile_flag.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ax_check_link_flag.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ax_check_link_flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ax_check_link_flag.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ax_check_link_flag.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/ax_pthread.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/ax_pthread.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/ax_pthread.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/ax_pthread.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/pkg.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/pkg.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/pkg.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/pkg.m4
diff --git a/mongodb-1.1.5/src/libbson/build/autotools/m4/silent.m4 b/mongodb-1.1.6/src/libbson/build/autotools/m4/silent.m4
similarity index 100%
rename from mongodb-1.1.5/src/libbson/build/autotools/m4/silent.m4
rename to mongodb-1.1.6/src/libbson/build/autotools/m4/silent.m4
diff --git a/mongodb-1.1.5/src/libbson/src/bson/b64_ntop.h b/mongodb-1.1.6/src/libbson/src/bson/b64_ntop.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/b64_ntop.h
rename to mongodb-1.1.6/src/libbson/src/bson/b64_ntop.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/b64_pton.h b/mongodb-1.1.6/src/libbson/src/bson/b64_pton.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/b64_pton.h
rename to mongodb-1.1.6/src/libbson/src/bson/b64_pton.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bcon.c b/mongodb-1.1.6/src/libbson/src/bson/bcon.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bcon.c
rename to mongodb-1.1.6/src/libbson/src/bson/bcon.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bcon.h b/mongodb-1.1.6/src/libbson/src/bson/bcon.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bcon.h
rename to mongodb-1.1.6/src/libbson/src/bson/bcon.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-atomic.c b/mongodb-1.1.6/src/libbson/src/bson/bson-atomic.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-atomic.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-atomic.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-atomic.h b/mongodb-1.1.6/src/libbson/src/bson/bson-atomic.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-atomic.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-atomic.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-clock.c b/mongodb-1.1.6/src/libbson/src/bson/bson-clock.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-clock.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-clock.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-clock.h b/mongodb-1.1.6/src/libbson/src/bson/bson-clock.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-clock.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-clock.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-compat.h b/mongodb-1.1.6/src/libbson/src/bson/bson-compat.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-compat.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-compat.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-config.h b/mongodb-1.1.6/src/libbson/src/bson/bson-config.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-config.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-config.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-config.h.in b/mongodb-1.1.6/src/libbson/src/bson/bson-config.h.in
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-config.h.in
rename to mongodb-1.1.6/src/libbson/src/bson/bson-config.h.in
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-context-private.h b/mongodb-1.1.6/src/libbson/src/bson/bson-context-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-context-private.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-context-private.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-context.c b/mongodb-1.1.6/src/libbson/src/bson/bson-context.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-context.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-context.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-context.h b/mongodb-1.1.6/src/libbson/src/bson/bson-context.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-context.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-context.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-endian.h b/mongodb-1.1.6/src/libbson/src/bson/bson-endian.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-endian.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-endian.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-error.c b/mongodb-1.1.6/src/libbson/src/bson/bson-error.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-error.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-error.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-error.h b/mongodb-1.1.6/src/libbson/src/bson/bson-error.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-error.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-error.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-iso8601-private.h b/mongodb-1.1.6/src/libbson/src/bson/bson-iso8601-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-iso8601-private.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-iso8601-private.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-iso8601.c b/mongodb-1.1.6/src/libbson/src/bson/bson-iso8601.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-iso8601.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-iso8601.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-iter.c b/mongodb-1.1.6/src/libbson/src/bson/bson-iter.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-iter.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-iter.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-iter.h b/mongodb-1.1.6/src/libbson/src/bson/bson-iter.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-iter.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-iter.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-json.c b/mongodb-1.1.6/src/libbson/src/bson/bson-json.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-json.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-json.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-json.h b/mongodb-1.1.6/src/libbson/src/bson/bson-json.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-json.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-json.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-keys.c b/mongodb-1.1.6/src/libbson/src/bson/bson-keys.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-keys.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-keys.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-keys.h b/mongodb-1.1.6/src/libbson/src/bson/bson-keys.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-keys.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-keys.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-macros.h b/mongodb-1.1.6/src/libbson/src/bson/bson-macros.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-macros.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-macros.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-md5.c b/mongodb-1.1.6/src/libbson/src/bson/bson-md5.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-md5.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-md5.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-md5.h b/mongodb-1.1.6/src/libbson/src/bson/bson-md5.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-md5.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-md5.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-memory.c b/mongodb-1.1.6/src/libbson/src/bson/bson-memory.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-memory.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-memory.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-memory.h b/mongodb-1.1.6/src/libbson/src/bson/bson-memory.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-memory.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-memory.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-oid.c b/mongodb-1.1.6/src/libbson/src/bson/bson-oid.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-oid.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-oid.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-oid.h b/mongodb-1.1.6/src/libbson/src/bson/bson-oid.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-oid.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-oid.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-private.h b/mongodb-1.1.6/src/libbson/src/bson/bson-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-private.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-private.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-reader.c b/mongodb-1.1.6/src/libbson/src/bson/bson-reader.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-reader.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-reader.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-reader.h b/mongodb-1.1.6/src/libbson/src/bson/bson-reader.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-reader.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-reader.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-stdint-win32.h b/mongodb-1.1.6/src/libbson/src/bson/bson-stdint-win32.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-stdint-win32.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-stdint-win32.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-stdint.h b/mongodb-1.1.6/src/libbson/src/bson/bson-stdint.h
similarity index 50%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-stdint.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-stdint.h
index 00747ffb..38716962 100644
--- a/mongodb-1.1.5/src/libbson/src/bson/bson-stdint.h
+++ b/mongodb-1.1.6/src/libbson/src/bson/bson-stdint.h
@@ -1,17 +1,17 @@
#ifndef ___SRC_LIBBSON_SRC_BSON_BSON_STDINT_H
#define ___SRC_LIBBSON_SRC_BSON_BSON_STDINT_H 1
#ifndef _GENERATED_STDINT_H
#define _GENERATED_STDINT_H " "
-/* generated using a gnu compiler version cc (Ubuntu 5.2.1-22ubuntu2) 5.2.1 20151010 Copyright (C) 2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* generated using a gnu compiler version cc (Ubuntu 4.9.2-10ubuntu13) 4.9.2 Copyright (C) 2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
#include <stdint.h>
/* system headers have good uint64_t */
#ifndef _HAVE_UINT64_T
#define _HAVE_UINT64_T
#endif
/* once */
#endif
#endif
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-string.c b/mongodb-1.1.6/src/libbson/src/bson/bson-string.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-string.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-string.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-string.h b/mongodb-1.1.6/src/libbson/src/bson/bson-string.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-string.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-string.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-thread-private.h b/mongodb-1.1.6/src/libbson/src/bson/bson-thread-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-thread-private.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-thread-private.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-timegm-private.h b/mongodb-1.1.6/src/libbson/src/bson/bson-timegm-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-timegm-private.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-timegm-private.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-timegm.c b/mongodb-1.1.6/src/libbson/src/bson/bson-timegm.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-timegm.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-timegm.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-types.h b/mongodb-1.1.6/src/libbson/src/bson/bson-types.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-types.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-types.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-utf8.c b/mongodb-1.1.6/src/libbson/src/bson/bson-utf8.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-utf8.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-utf8.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-utf8.h b/mongodb-1.1.6/src/libbson/src/bson/bson-utf8.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-utf8.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-utf8.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-value.c b/mongodb-1.1.6/src/libbson/src/bson/bson-value.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-value.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-value.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-value.h b/mongodb-1.1.6/src/libbson/src/bson/bson-value.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-value.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-value.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-version-functions.c b/mongodb-1.1.6/src/libbson/src/bson/bson-version-functions.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-version-functions.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-version-functions.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-version-functions.h b/mongodb-1.1.6/src/libbson/src/bson/bson-version-functions.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-version-functions.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-version-functions.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-version.h b/mongodb-1.1.6/src/libbson/src/bson/bson-version.h
similarity index 96%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-version.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-version.h
index 91cd1d61..ca2920ff 100644
--- a/mongodb-1.1.5/src/libbson/src/bson/bson-version.h
+++ b/mongodb-1.1.6/src/libbson/src/bson/bson-version.h
@@ -1,101 +1,101 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined (BSON_INSIDE) && !defined (BSON_COMPILATION)
#error "Only <bson.h> can be included directly."
#endif
#ifndef BSON_VERSION_H
#define BSON_VERSION_H
/**
* BSON_MAJOR_VERSION:
*
* BSON major version component (e.g. 1 if %BSON_VERSION is 1.2.3)
*/
#define BSON_MAJOR_VERSION (1)
/**
* BSON_MINOR_VERSION:
*
* BSON minor version component (e.g. 2 if %BSON_VERSION is 1.2.3)
*/
#define BSON_MINOR_VERSION (3)
/**
* BSON_MICRO_VERSION:
*
* BSON micro version component (e.g. 3 if %BSON_VERSION is 1.2.3)
*/
-#define BSON_MICRO_VERSION (3)
+#define BSON_MICRO_VERSION (5)
/**
* BSON_PRERELEASE_VERSION:
*
* BSON prerelease version component (e.g. rc0 if %BSON_VERSION is 1.2.3-rc0)
*/
#define BSON_PRERELEASE_VERSION ()
/**
* BSON_VERSION:
*
* BSON version.
*/
-#define BSON_VERSION (1.3.3)
+#define BSON_VERSION (1.3.5)
/**
* BSON_VERSION_S:
*
* BSON version, encoded as a string, useful for printing and
* concatenation.
*/
-#define BSON_VERSION_S "1.3.3"
+#define BSON_VERSION_S "1.3.5"
/**
* BSON_VERSION_HEX:
*
* BSON version, encoded as an hexadecimal number, useful for
* integer comparisons.
*/
#define BSON_VERSION_HEX (BSON_MAJOR_VERSION << 24 | \
BSON_MINOR_VERSION << 16 | \
BSON_MICRO_VERSION << 8)
/**
* BSON_CHECK_VERSION:
* @major: required major version
* @minor: required minor version
* @micro: required micro version
*
* Compile-time version checking. Evaluates to %TRUE if the version
* of BSON is greater than the required one.
*/
#define BSON_CHECK_VERSION(major,minor,micro) \
(BSON_MAJOR_VERSION > (major) || \
(BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION > (minor)) || \
(BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION == (minor) && \
BSON_MICRO_VERSION >= (micro)))
#endif /* BSON_VERSION_H */
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-version.h.in b/mongodb-1.1.6/src/libbson/src/bson/bson-version.h.in
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-version.h.in
rename to mongodb-1.1.6/src/libbson/src/bson/bson-version.h.in
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-writer.c b/mongodb-1.1.6/src/libbson/src/bson/bson-writer.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-writer.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson-writer.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson-writer.h b/mongodb-1.1.6/src/libbson/src/bson/bson-writer.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson-writer.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson-writer.h
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson.c b/mongodb-1.1.6/src/libbson/src/bson/bson.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson.c
rename to mongodb-1.1.6/src/libbson/src/bson/bson.c
diff --git a/mongodb-1.1.5/src/libbson/src/bson/bson.h b/mongodb-1.1.6/src/libbson/src/bson/bson.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/bson/bson.h
rename to mongodb-1.1.6/src/libbson/src/bson/bson.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_alloc.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_alloc.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_alloc.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_alloc.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_alloc.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_alloc.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_alloc.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_alloc.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_buf.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_buf.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_buf.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_buf.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_buf.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_buf.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_buf.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_buf.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_bytestack.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_bytestack.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_bytestack.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_bytestack.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_common.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_common.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_common.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_common.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_encode.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_encode.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_encode.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_encode.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_encode.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_encode.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_encode.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_encode.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_gen.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_gen.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_gen.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_gen.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_gen.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_gen.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_gen.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_gen.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_lex.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_lex.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_lex.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_lex.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_lex.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_lex.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_lex.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_lex.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_parse.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_parse.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_parse.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_parse.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_parser.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_parser.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_parser.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_parser.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_parser.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_parser.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_parser.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_parser.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_tree.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_tree.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_tree.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_tree.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_tree.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_tree.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_tree.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_tree.h
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_version.c b/mongodb-1.1.6/src/libbson/src/yajl/yajl_version.c
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_version.c
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_version.c
diff --git a/mongodb-1.1.5/src/libbson/src/yajl/yajl_version.h b/mongodb-1.1.6/src/libbson/src/yajl/yajl_version.h
similarity index 100%
rename from mongodb-1.1.5/src/libbson/src/yajl/yajl_version.h
rename to mongodb-1.1.6/src/libbson/src/yajl/yajl_version.h
diff --git a/mongodb-1.1.6/src/libmongoc/VERSION_CURRENT b/mongodb-1.1.6/src/libmongoc/VERSION_CURRENT
new file mode 100644
index 00000000..aaf8be71
--- /dev/null
+++ b/mongodb-1.1.6/src/libmongoc/VERSION_CURRENT
@@ -0,0 +1 @@
+1.3.5
\ No newline at end of file
diff --git a/mongodb-1.1.6/src/libmongoc/VERSION_RELEASED b/mongodb-1.1.6/src/libmongoc/VERSION_RELEASED
new file mode 100644
index 00000000..aaf8be71
--- /dev/null
+++ b/mongodb-1.1.6/src/libmongoc/VERSION_RELEASED
@@ -0,0 +1 @@
+1.3.5
\ No newline at end of file
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/AutoHarden.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/AutoHarden.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/AutoHarden.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/AutoHarden.m4
diff --git a/mongodb-1.1.6/src/libmongoc/build/autotools/AutomaticInitAndCleanup.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/AutomaticInitAndCleanup.m4
new file mode 100644
index 00000000..7e5d8fd3
--- /dev/null
+++ b/mongodb-1.1.6/src/libmongoc/build/autotools/AutomaticInitAndCleanup.m4
@@ -0,0 +1,6 @@
+AS_IF([test "$enable_automatic_init_and_cleanup" != "no"], [
+ AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 0)
+], [
+ AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
+])
+
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckCompiler.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckCompiler.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckCompiler.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckCompiler.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckHost.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckHost.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckHost.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckHost.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckProgs.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckProgs.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckProgs.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckProgs.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckSSL.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckSSL.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckSSL.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckSSL.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckSasl.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckSasl.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckSasl.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckSasl.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/CheckTarget.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/CheckTarget.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/CheckTarget.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/CheckTarget.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/Coverage.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/Coverage.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/Coverage.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/Coverage.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/FindDependencies.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/FindDependencies.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/FindDependencies.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/FindDependencies.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/LDVersionScript.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/LDVersionScript.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/LDVersionScript.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/LDVersionScript.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/Libbson.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/Libbson.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/Libbson.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/Libbson.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/MaintainerFlags.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/MaintainerFlags.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/MaintainerFlags.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/MaintainerFlags.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/Optimizations.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/Optimizations.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/Optimizations.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/Optimizations.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/PlatformFlags.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/PlatformFlags.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/PlatformFlags.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/PlatformFlags.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/PrintBuildConfiguration.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
similarity index 94%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
index 532c0aff..5d71ae3d 100644
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
+++ b/mongodb-1.1.6/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
@@ -1,44 +1,45 @@
AC_OUTPUT
if test -n "$MONGOC_PRERELEASE_VERSION"; then
cat << EOF
*** IMPORTANT ***
This is an unstable version of libmongoc.
It is for test purposes only.
Please, DO NOT use it in a production environment.
It will probably crash and you will lose your data.
Additionally, the API/ABI may change during the course
of development.
Thanks,
The libmongoc team.
*** END OF WARNING ***
EOF
fi
echo "
libmongoc $MONGOC_VERSION was configured with the following options:
Build configuration:
Enable debugging (slow) : ${enable_debug}
Compile with debug symbols (slow) : ${enable_debug_symbols}
Enable GCC build optimization : ${enable_optimizations}
Enable automatic binary hardening : ${enable_hardening}
+ Enable automatic init and cleanup : ${enable_automatic_init_and_cleanup}
Code coverage support : ${enable_coverage}
Cross Compiling : ${enable_crosscompile}
Fast counters : ${enable_rdtscp}
Shared memory performance counters : ${enable_shm_counters}
SASL : ${sasl_mode}
SSL : ${enable_ssl}
Libbson : ${with_libbson}
Documentation:
man : ${enable_man_pages}
HTML : ${enable_html_docs}
"
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/ReadCommandLineArguments.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
similarity index 92%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
index 047e373b..efc2f0b7 100644
--- a/mongodb-1.1.5/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
+++ b/mongodb-1.1.6/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
@@ -1,110 +1,116 @@
AC_MSG_CHECKING([whether to do a debug build])
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug], [turn on debugging [default=no]]),
[],[enable_debug="no"])
AC_MSG_RESULT([$enable_debug])
AC_MSG_CHECKING([whether to enable tracing])
AC_ARG_ENABLE(tracing,
AC_HELP_STRING([--enable-tracing], [turn on tracing [default=no]]),
[],[enable_tracing="no"])
AC_MSG_RESULT([$enable_tracing])
+AC_MSG_CHECKING([whether to automatic init and cleanup])
+AC_ARG_ENABLE(automatic-init-and-cleanup,
+ AC_HELP_STRING([--enable-automatic-init-and-cleanup], [turn on automatic mongoc_init() and mongoc_cleanup() [default=yes]]),
+ [],[enable_automatic_init_and_cleanup="yes"])
+AC_MSG_RESULT([$enable_automatic_init_and_cleanup])
+
AC_MSG_CHECKING([whether to enable optimized builds])
AC_ARG_ENABLE(optimizations,
AC_HELP_STRING([--enable-optimizations], [turn on build-time optimizations [default=yes]]),
[enable_optimizations=$enableval],
[
if test "$enable_debug" = "yes"; then
enable_optimizations="no";
else
enable_optimizations="yes";
fi
])
AC_MSG_RESULT([$enable_optimizations])
AC_MSG_CHECKING([whether to enable shared memory performance counters])
AC_ARG_ENABLE(shm_counters,
AC_HELP_STRING([--enable-shm-counters], [turn on shared memory performance counters [default=yes]]),
[],[enable_shm_counters="yes"])
AC_MSG_RESULT([$enable_shm_counters])
AC_MSG_CHECKING([whether to enable code coverage support])
AC_ARG_ENABLE(coverage,
AC_HELP_STRING([--enable-coverage], [enable code coverage support [default=no]]),
[],
[enable_coverage="no"])
AC_MSG_RESULT([$enable_coverage])
AC_MSG_CHECKING([whether to enable debug symbols])
AC_ARG_ENABLE(debug_symbols,
AC_HELP_STRING([--enable-debug-symbols=yes|no|min|full], [enable debug symbols default=no, default=yes for debug builds]),
[
case "$enable_debug_symbols" in
yes) enable_debug_symbols="full" ;;
no|min|full) ;;
*) AC_MSG_ERROR([Invalid debug symbols option: must be yes, no, min or full.]) ;;
esac
],
[
if test "$enable_debug" = "yes"; then
enable_debug_symbols="yes";
else
enable_debug_symbols="no";
fi
])
AC_MSG_RESULT([$enable_debug_symbols])
AC_ARG_ENABLE([rdtscp],
[AS_HELP_STRING([--enable-rdtscp=@<:@no/yes@:>@],
[Use rdtscp for per-cpu counters @<:@default=no@:>@])],
[],
[enable_rdtscp=no])
# use strict compiler flags only on development releases
m4_define([maintainer_flags_default], [m4_ifset([MONGOC_PRERELEASE_VERSION], [yes], [no])])
AC_ARG_ENABLE([maintainer-flags],
[AS_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
[Use strict compiler flags @<:@default=]maintainer_flags_default[@:>@])],
[],
[enable_maintainer_flags=maintainer_flags_default])
# Check if we should use the bundled (git submodule) libbson
AC_ARG_WITH(libbson,
AC_HELP_STRING([--with-libbson=@<:@auto/system/bundled@:>@],
[use system installed libbson or bundled libbson. default=auto]),
[],
[with_libbson=auto])
AS_IF([test "x$with_libbson" != xbundled && test "x$with_libbson" != xsystem],
[with_libbson=auto])
AC_ARG_ENABLE([html-docs],
[AS_HELP_STRING([--enable-html-docs=@<:@yes/no@:>@],
[Build HTML documentation.])],
[],
[enable_html_docs=no])
AC_ARG_ENABLE([man-pages],
[AS_HELP_STRING([--enable-man-pages=@<:@yes/no@:>@],
[Build and install man-pages.])],
[],
[enable_man_pages=no])
AC_ARG_ENABLE([yelp],
[AS_HELP_STRING([--enable-yelp=@<:@yes/no@:>@],
[Install yelp manuals.])],
[],
[enable_yelp=no])
AC_ARG_ENABLE([examples],
[AS_HELP_STRING([--enable-examples=@<:@yes/no@:>@],
[Build MongoDB C Driver examples.])],
[],
[enable_examples=yes])
AC_ARG_ENABLE([tests],
[AS_HELP_STRING([--enable-tests=@<:@yes/no@:>@],
[Build MongoDB C Driver tests.])],
[],
[enable_tests=yes])
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/SetupAutomake.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/SetupAutomake.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/SetupAutomake.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/SetupAutomake.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/SetupLibtool.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/SetupLibtool.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/SetupLibtool.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/SetupLibtool.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/Versions.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/Versions.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/Versions.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/Versions.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/WeakSymbols.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/WeakSymbols.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/WeakSymbols.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/WeakSymbols.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_check_typedef.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/as-compiler-flag.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_pthread.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_pthread.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/ax_pthread.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/ax_pthread.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/pkg.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/pkg.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/pkg.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/pkg.m4
diff --git a/mongodb-1.1.5/src/libmongoc/build/autotools/m4/silent.m4 b/mongodb-1.1.6/src/libmongoc/build/autotools/m4/silent.m4
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/build/autotools/m4/silent.m4
rename to mongodb-1.1.6/src/libmongoc/build/autotools/m4/silent.m4
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-array-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-array-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-array-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-array-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-array.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-array.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-array.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-array.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-cmd.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-cmd.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-cmd.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-cmd.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-async.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-async.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-b64-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-b64-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-b64-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-b64-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-b64.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-b64.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-b64.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-b64.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-buffer-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-buffer-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-buffer-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-buffer-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-buffer.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-buffer.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-buffer.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-buffer.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-pool.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-pool.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client.c
similarity index 98%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client.c
index f4aaa30c..0063c74d 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client.c
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client.c
@@ -1,1526 +1,1534 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <bson.h>
#ifndef _WIN32
# include <netdb.h>
# include <netinet/tcp.h>
#endif
#include "mongoc-cursor-array-private.h"
#include "mongoc-client-private.h"
#include "mongoc-collection-private.h"
#include "mongoc-config.h"
#include "mongoc-counters-private.h"
#include "mongoc-database-private.h"
#include "mongoc-gridfs-private.h"
#include "mongoc-error.h"
#include "mongoc-log.h"
#include "mongoc-queue-private.h"
#include "mongoc-socket.h"
#include "mongoc-stream-buffered.h"
#include "mongoc-stream-socket.h"
#include "mongoc-thread-private.h"
#include "mongoc-trace.h"
#include "mongoc-uri-private.h"
#include "mongoc-util-private.h"
#ifdef MONGOC_ENABLE_SSL
#include "mongoc-stream-tls.h"
#include "mongoc-ssl-private.h"
#endif
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "client"
static void
_mongoc_client_op_killcursors (mongoc_cluster_t *cluster,
mongoc_server_stream_t *server_stream,
int64_t cursor_id);
static void
_mongoc_client_killcursors_command (mongoc_cluster_t *cluster,
mongoc_server_stream_t *server_stream,
int64_t cursor_id,
const char *db,
const char *collection);
/*
*--------------------------------------------------------------------------
*
* mongoc_client_connect_tcp --
*
* Connect to a host using a TCP socket.
*
* This will be performed synchronously and return a mongoc_stream_t
* that can be used to connect with the remote host.
*
* Returns:
* A newly allocated mongoc_stream_t if successful; otherwise
* NULL and @error is set.
*
* Side effects:
* @error is set if return value is NULL.
*
*--------------------------------------------------------------------------
*/
static mongoc_stream_t *
mongoc_client_connect_tcp (const mongoc_uri_t *uri,
const mongoc_host_list_t *host,
bson_error_t *error)
{
mongoc_socket_t *sock = NULL;
struct addrinfo hints;
struct addrinfo *result, *rp;
int32_t connecttimeoutms;
int64_t expire_at;
char portstr [8];
int s;
ENTRY;
BSON_ASSERT (uri);
BSON_ASSERT (host);
connecttimeoutms = mongoc_uri_get_option_as_int32 (
uri, "connecttimeoutms", MONGOC_DEFAULT_CONNECTTIMEOUTMS);
BSON_ASSERT (connecttimeoutms);
expire_at = bson_get_monotonic_time () + (connecttimeoutms * 1000L);
bson_snprintf (portstr, sizeof portstr, "%hu", host->port);
memset (&hints, 0, sizeof hints);
hints.ai_family = host->family;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = 0;
hints.ai_protocol = 0;
s = getaddrinfo (host->host, portstr, &hints, &result);
if (s != 0) {
mongoc_counter_dns_failure_inc ();
bson_set_error(error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_NAME_RESOLUTION,
"Failed to resolve %s",
host->host);
RETURN (NULL);
}
mongoc_counter_dns_success_inc ();
for (rp = result; rp; rp = rp->ai_next) {
/*
* Create a new non-blocking socket.
*/
if (!(sock = mongoc_socket_new (rp->ai_family,
rp->ai_socktype,
rp->ai_protocol))) {
continue;
}
/*
* Try to connect to the peer.
*/
if (0 != mongoc_socket_connect (sock,
rp->ai_addr,
(socklen_t)rp->ai_addrlen,
expire_at)) {
char *errmsg;
char errmsg_buf[BSON_ERROR_BUFFER_SIZE];
char ip[255];
mongoc_socket_inet_ntop (rp, ip, sizeof ip);
errmsg = bson_strerror_r (
mongoc_socket_errno (sock), errmsg_buf, sizeof errmsg_buf);
MONGOC_WARNING ("Failed to connect to: %s:%d, error: %d, %s\n",
ip,
host->port,
mongoc_socket_errno(sock),
errmsg);
mongoc_socket_destroy (sock);
sock = NULL;
continue;
}
break;
}
if (!sock) {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_CONNECT,
"Failed to connect to target host: %s",
host->host_and_port);
freeaddrinfo (result);
RETURN (NULL);
}
freeaddrinfo (result);
return mongoc_stream_socket_new (sock);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_connect_unix --
*
* Connect to a MongoDB server using a UNIX domain socket.
*
* Returns:
* A newly allocated mongoc_stream_t if successful; otherwise
* NULL and @error is set.
*
* Side effects:
* @error is set if return value is NULL.
*
*--------------------------------------------------------------------------
*/
static mongoc_stream_t *
mongoc_client_connect_unix (const mongoc_uri_t *uri,
const mongoc_host_list_t *host,
bson_error_t *error)
{
#ifdef _WIN32
ENTRY;
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_CONNECT,
"UNIX domain sockets not supported on win32.");
RETURN (NULL);
#else
struct sockaddr_un saddr;
mongoc_socket_t *sock;
mongoc_stream_t *ret = NULL;
ENTRY;
BSON_ASSERT (uri);
BSON_ASSERT (host);
memset (&saddr, 0, sizeof saddr);
saddr.sun_family = AF_UNIX;
bson_snprintf (saddr.sun_path, sizeof saddr.sun_path - 1,
"%s", host->host);
sock = mongoc_socket_new (AF_UNIX, SOCK_STREAM, 0);
if (sock == NULL) {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_SOCKET,
"Failed to create socket.");
RETURN (NULL);
}
if (-1 == mongoc_socket_connect (sock,
(struct sockaddr *)&saddr,
sizeof saddr,
-1)) {
mongoc_socket_destroy (sock);
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_CONNECT,
"Failed to connect to UNIX domain socket.");
RETURN (NULL);
}
ret = mongoc_stream_socket_new (sock);
RETURN (ret);
#endif
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_default_stream_initiator --
*
* A mongoc_stream_initiator_t that will handle the various type
* of supported sockets by MongoDB including TCP and UNIX.
*
* Language binding authors may want to implement an alternate
* version of this method to use their native stream format.
*
* Returns:
* A mongoc_stream_t if successful; otherwise NULL and @error is set.
*
* Side effects:
* @error is set if return value is NULL.
*
*--------------------------------------------------------------------------
*/
mongoc_stream_t *
mongoc_client_default_stream_initiator (const mongoc_uri_t *uri,
const mongoc_host_list_t *host,
void *user_data,
bson_error_t *error)
{
mongoc_stream_t *base_stream = NULL;
#ifdef MONGOC_ENABLE_SSL
mongoc_client_t *client = (mongoc_client_t *)user_data;
const char *mechanism;
int32_t connecttimeoutms;
#endif
BSON_ASSERT (uri);
BSON_ASSERT (host);
#ifndef MONGOC_ENABLE_SSL
if (mongoc_uri_get_ssl (uri)) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_NO_ACCEPTABLE_PEER,
"SSL is not enabled in this build of mongo-c-driver.");
return NULL;
}
#endif
switch (host->family) {
#if defined(AF_INET6)
case AF_INET6:
#endif
case AF_INET:
base_stream = mongoc_client_connect_tcp (uri, host, error);
break;
case AF_UNIX:
base_stream = mongoc_client_connect_unix (uri, host, error);
break;
default:
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_INVALID_TYPE,
"Invalid address family: 0x%02x", host->family);
break;
}
#ifdef MONGOC_ENABLE_SSL
if (base_stream) {
mechanism = mongoc_uri_get_auth_mechanism (uri);
if (client->use_ssl ||
(mechanism && (0 == strcmp (mechanism, "MONGODB-X509")))) {
base_stream = mongoc_stream_tls_new (base_stream, &client->ssl_opts,
true);
if (!base_stream) {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_SOCKET,
"Failed initialize TLS state.");
return NULL;
}
connecttimeoutms = mongoc_uri_get_option_as_int32 (
uri, "connecttimeoutms", MONGOC_DEFAULT_CONNECTTIMEOUTMS);
- if (!mongoc_stream_tls_do_handshake (base_stream, connecttimeoutms) ||
- !mongoc_stream_tls_check_cert (base_stream, host->host)) {
+ if (!mongoc_stream_tls_do_handshake (base_stream, connecttimeoutms)) {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_SOCKET,
- "Failed to handshake and validate TLS certificate.");
+ "TLS handshake failed.");
+ mongoc_stream_destroy (base_stream);
+ return NULL;
+ }
+
+ if (!mongoc_stream_tls_check_cert (base_stream, host->host)) {
+ bson_set_error (error,
+ MONGOC_ERROR_STREAM,
+ MONGOC_ERROR_STREAM_SOCKET,
+ "Failed to verify peer certificate.");
mongoc_stream_destroy (base_stream);
return NULL;
}
}
}
#endif
return base_stream ? mongoc_stream_buffered_new (base_stream, 1024) : NULL;
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_client_create_stream --
*
* INTERNAL API
*
* This function is used by the mongoc_cluster_t to initiate a
* new stream. This is done because cluster is private API and
* those using mongoc_client_t may need to override this process.
*
* This function calls the default initiator for new streams.
*
* Returns:
* A newly allocated mongoc_stream_t if successful; otherwise
* NULL and @error is set.
*
* Side effects:
* @error is set if return value is NULL.
*
*--------------------------------------------------------------------------
*/
mongoc_stream_t *
_mongoc_client_create_stream (mongoc_client_t *client,
const mongoc_host_list_t *host,
bson_error_t *error)
{
BSON_ASSERT (client);
BSON_ASSERT (host);
return client->initiator (client->uri, host, client->initiator_data, error);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_client_recv --
*
* Receives a RPC from a remote MongoDB cluster node.
*
* Returns:
* true if successful; otherwise false and @error is set.
*
* Side effects:
* @error is set if return value is false.
*
*--------------------------------------------------------------------------
*/
bool
_mongoc_client_recv (mongoc_client_t *client,
mongoc_rpc_t *rpc,
mongoc_buffer_t *buffer,
mongoc_server_stream_t *server_stream,
bson_error_t *error)
{
BSON_ASSERT (client);
BSON_ASSERT (rpc);
BSON_ASSERT (buffer);
BSON_ASSERT (server_stream);
if (!mongoc_cluster_try_recv (&client->cluster, rpc, buffer,
server_stream, error)) {
mongoc_topology_invalidate_server (client->topology,
server_stream->sd->id);
return false;
}
return true;
}
/*
*--------------------------------------------------------------------------
*
* _bson_to_error --
*
* A helper routine to convert a bson document to a bson_error_t.
*
* Returns:
* None.
*
* Side effects:
* @error is set if non-null.
*
*--------------------------------------------------------------------------
*/
static void
_bson_to_error (const bson_t *b,
bson_error_t *error)
{
bson_iter_t iter;
int code = 0;
BSON_ASSERT (b);
if (!error) {
return;
}
if (bson_iter_init_find(&iter, b, "code") && BSON_ITER_HOLDS_INT32(&iter)) {
code = bson_iter_int32(&iter);
}
if (bson_iter_init_find(&iter, b, "$err") && BSON_ITER_HOLDS_UTF8(&iter)) {
bson_set_error(error,
MONGOC_ERROR_QUERY,
code,
"%s",
bson_iter_utf8(&iter, NULL));
return;
}
if (bson_iter_init_find(&iter, b, "errmsg") && BSON_ITER_HOLDS_UTF8(&iter)) {
bson_set_error(error,
MONGOC_ERROR_QUERY,
code,
"%s",
bson_iter_utf8(&iter, NULL));
return;
}
bson_set_error(error,
MONGOC_ERROR_QUERY,
MONGOC_ERROR_QUERY_FAILURE,
"An unknown error ocurred on the server.");
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_recv_gle --
*
* INTERNAL API
*
* This function is used to receive the next RPC from a cluster
* node, expecting it to be the response to a getlasterror command.
*
* The RPC is parsed into @error if it is an error and false is
* returned.
*
* If the operation was successful, true is returned.
*
* if @gle_doc is not NULL, then the actual response document for
* the gle command will be stored as an out parameter. The caller
* is responsible for freeing it in this case.
*
* Returns:
* true if getlasterror was success; otherwise false.
*
* Side effects:
* @gle_doc will be set if non NULL and a reply was received.
* @error if return value is false, and @gle_doc is set to NULL.
*
*--------------------------------------------------------------------------
*/
bool
_mongoc_client_recv_gle (mongoc_client_t *client,
mongoc_server_stream_t *server_stream,
bson_t **gle_doc,
bson_error_t *error)
{
mongoc_buffer_t buffer;
mongoc_rpc_t rpc;
bson_iter_t iter;
bool ret = false;
bson_t b;
ENTRY;
BSON_ASSERT (client);
BSON_ASSERT (server_stream);
if (gle_doc) {
*gle_doc = NULL;
}
_mongoc_buffer_init (&buffer, NULL, 0, NULL, NULL);
if (!mongoc_cluster_try_recv (&client->cluster, &rpc, &buffer,
server_stream, error)) {
mongoc_topology_invalidate_server (client->topology,
server_stream->sd->id);
GOTO (cleanup);
}
if (rpc.header.opcode != MONGOC_OPCODE_REPLY) {
bson_set_error (error,
MONGOC_ERROR_PROTOCOL,
MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
"Received message other than OP_REPLY.");
GOTO (cleanup);
}
if (_mongoc_rpc_reply_get_first (&rpc.reply, &b)) {
if ((rpc.reply.flags & MONGOC_REPLY_QUERY_FAILURE)) {
_bson_to_error (&b, error);
bson_destroy (&b);
GOTO (cleanup);
}
if (gle_doc) {
*gle_doc = bson_copy (&b);
}
if (!bson_iter_init_find (&iter, &b, "ok") ||
BSON_ITER_HOLDS_DOUBLE (&iter)) {
if (bson_iter_double (&iter) == 0.0) {
_bson_to_error (&b, error);
}
}
bson_destroy (&b);
ret = true;
}
cleanup:
_mongoc_buffer_destroy (&buffer);
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_new --
*
* Create a new mongoc_client_t using the URI provided.
*
* @uri should be a MongoDB URI string such as "mongodb://localhost/"
* More information on the format can be found at
* http://docs.mongodb.org/manual/reference/connection-string/
*
* Returns:
* A newly allocated mongoc_client_t or NULL if @uri_string is
* invalid.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_client_t *
mongoc_client_new(const char *uri_string)
{
mongoc_topology_t *topology;
mongoc_client_t *client;
mongoc_uri_t *uri;
if (!uri_string) {
uri_string = "mongodb://127.0.0.1/";
}
if (!(uri = mongoc_uri_new (uri_string))) {
return NULL;
}
topology = mongoc_topology_new(uri, true);
client = _mongoc_client_new_from_uri (uri, topology);
mongoc_uri_destroy (uri);
return client;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_set_ssl_opts
*
* set ssl opts for a client
*
* Returns:
* Nothing
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
#ifdef MONGOC_ENABLE_SSL
void
mongoc_client_set_ssl_opts (mongoc_client_t *client,
const mongoc_ssl_opt_t *opts)
{
BSON_ASSERT (client);
BSON_ASSERT (opts);
client->use_ssl = true;
memcpy (&client->ssl_opts, opts, sizeof client->ssl_opts);
bson_free (client->pem_subject);
client->pem_subject = NULL;
if (opts->pem_file) {
client->pem_subject = _mongoc_ssl_extract_subject (opts->pem_file);
}
if (client->topology->single_threaded) {
mongoc_topology_scanner_set_ssl_opts (client->topology->scanner,
&client->ssl_opts);
}
}
#endif
/*
*--------------------------------------------------------------------------
*
* mongoc_client_new_from_uri --
*
* Create a new mongoc_client_t for a mongoc_uri_t.
*
* Returns:
* A newly allocated mongoc_client_t.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_client_t *
mongoc_client_new_from_uri (const mongoc_uri_t *uri)
{
mongoc_topology_t *topology;
topology = mongoc_topology_new (uri, true);
return _mongoc_client_new_from_uri (uri, topology);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_client_new_from_uri --
*
* Create a new mongoc_client_t for a mongoc_uri_t and a given
* topology object.
*
* Returns:
* A newly allocated mongoc_client_t.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_client_t *
_mongoc_client_new_from_uri (const mongoc_uri_t *uri, mongoc_topology_t *topology)
{
mongoc_client_t *client;
const mongoc_read_prefs_t *read_prefs;
const mongoc_read_concern_t *read_concern;
const mongoc_write_concern_t *write_concern;
BSON_ASSERT (uri);
#ifndef MONGOC_ENABLE_SSL
if (mongoc_uri_get_ssl (uri)) {
MONGOC_ERROR ("Can't create SSL client, SSL not enabled in this build.");
return NULL;
}
#endif
client = (mongoc_client_t *)bson_malloc0(sizeof *client);
client->uri = mongoc_uri_copy (uri);
client->request_id = rand ();
client->initiator = mongoc_client_default_stream_initiator;
client->initiator_data = client;
client->topology = topology;
write_concern = mongoc_uri_get_write_concern (client->uri);
client->write_concern = mongoc_write_concern_copy (write_concern);
read_concern = mongoc_uri_get_read_concern (client->uri);
client->read_concern = mongoc_read_concern_copy (read_concern);
read_prefs = mongoc_uri_get_read_prefs_t (client->uri);
client->read_prefs = mongoc_read_prefs_copy (read_prefs);
mongoc_cluster_init (&client->cluster, client->uri, client);
#ifdef MONGOC_ENABLE_SSL
client->use_ssl = false;
if (mongoc_uri_get_ssl (client->uri)) {
/* sets use_ssl = true */
mongoc_client_set_ssl_opts (client, mongoc_ssl_opt_get_default ());
}
#endif
mongoc_counter_clients_active_inc ();
return client;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_destroy --
*
* Destroys a mongoc_client_t and cleans up all resources associated
* with the client instance.
*
* Returns:
* None.
*
* Side effects:
* @client is destroyed.
*
*--------------------------------------------------------------------------
*/
void
mongoc_client_destroy (mongoc_client_t *client)
{
if (client) {
#ifdef MONGOC_ENABLE_SSL
bson_free (client->pem_subject);
#endif
if (client->topology->single_threaded) {
mongoc_topology_destroy(client->topology);
}
mongoc_write_concern_destroy (client->write_concern);
mongoc_read_concern_destroy (client->read_concern);
mongoc_read_prefs_destroy (client->read_prefs);
mongoc_cluster_destroy (&client->cluster);
mongoc_uri_destroy (client->uri);
bson_free (client);
mongoc_counter_clients_active_dec ();
mongoc_counter_clients_disposed_inc ();
}
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_uri --
*
* Fetch the URI used for @client.
*
* Returns:
* A mongoc_uri_t that should not be modified or freed.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
const mongoc_uri_t *
mongoc_client_get_uri (const mongoc_client_t *client)
{
BSON_ASSERT (client);
return client->uri;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_database --
*
* Fetches a newly allocated database structure to communicate with
* a database over @client.
*
* @database should be a db name such as "test".
*
* This structure should be freed when the caller is done with it
* using mongoc_database_destroy().
*
* Returns:
* A newly allocated mongoc_database_t.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_database_t *
mongoc_client_get_database (mongoc_client_t *client,
const char *name)
{
BSON_ASSERT (client);
BSON_ASSERT (name);
return _mongoc_database_new(client, name, client->read_prefs,
client->read_concern, client->write_concern);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_default_database --
*
* Get the database named in the MongoDB connection URI, or NULL
* if none was specified in the URI.
*
* This structure should be freed when the caller is done with it
* using mongoc_database_destroy().
*
* Returns:
* A newly allocated mongoc_database_t or NULL.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_database_t *
mongoc_client_get_default_database (mongoc_client_t *client)
{
const char *db;
BSON_ASSERT (client);
db = mongoc_uri_get_database (client->uri);
if (db) {
return mongoc_client_get_database (client, db);
}
return NULL;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_collection --
*
* This function returns a newly allocated collection structure.
*
* @db should be the name of the database, such as "test".
* @collection should be the name of the collection such as "test".
*
* The above would result in the namespace "test.test".
*
* You should free this structure when you are done with it using
* mongoc_collection_destroy().
*
* Returns:
* A newly allocated mongoc_collection_t that should be freed with
* mongoc_collection_destroy().
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_collection_t *
mongoc_client_get_collection (mongoc_client_t *client,
const char *db,
const char *collection)
{
BSON_ASSERT (client);
BSON_ASSERT (db);
BSON_ASSERT (collection);
return _mongoc_collection_new(client, db, collection, client->read_prefs,
client->read_concern, client->write_concern);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_gridfs --
*
* This function returns a newly allocated collection structure.
*
* @db should be the name of the database, such as "test".
*
* @prefix optional prefix for GridFS collection names, or NULL. Default
* is "fs", thus the default collection names for GridFS are "fs.files"
* and "fs.chunks".
*
* Returns:
* A newly allocated mongoc_gridfs_t that should be freed with
* mongoc_gridfs_destroy().
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_gridfs_t *
mongoc_client_get_gridfs (mongoc_client_t *client,
const char *db,
const char *prefix,
bson_error_t *error)
{
BSON_ASSERT (client);
BSON_ASSERT (db);
if (! prefix) {
prefix = "fs";
}
return _mongoc_gridfs_new(client, db, prefix, error);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_write_concern --
*
* Fetches the default write concern for @client.
*
* Returns:
* A mongoc_write_concern_t that should not be modified or freed.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
const mongoc_write_concern_t *
mongoc_client_get_write_concern (const mongoc_client_t *client)
{
BSON_ASSERT (client);
return client->write_concern;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_set_write_concern --
*
* Sets the default write concern for @client.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
void
mongoc_client_set_write_concern (mongoc_client_t *client,
const mongoc_write_concern_t *write_concern)
{
BSON_ASSERT (client);
if (write_concern != client->write_concern) {
if (client->write_concern) {
mongoc_write_concern_destroy(client->write_concern);
}
client->write_concern = write_concern ?
mongoc_write_concern_copy(write_concern) :
mongoc_write_concern_new();
}
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_read_concern --
*
* Fetches the default read concern for @client.
*
* Returns:
* A mongoc_read_concern_t that should not be modified or freed.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
const mongoc_read_concern_t *
mongoc_client_get_read_concern (const mongoc_client_t *client)
{
BSON_ASSERT (client);
return client->read_concern;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_set_read_concern --
*
* Sets the default read concern for @client.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
void
mongoc_client_set_read_concern (mongoc_client_t *client,
const mongoc_read_concern_t *read_concern)
{
BSON_ASSERT (client);
if (read_concern != client->read_concern) {
if (client->read_concern) {
mongoc_read_concern_destroy (client->read_concern);
}
client->read_concern = read_concern ?
mongoc_read_concern_copy (read_concern) :
mongoc_read_concern_new ();
}
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_get_read_prefs --
*
* Fetch the default read preferences for @client.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
const mongoc_read_prefs_t *
mongoc_client_get_read_prefs (const mongoc_client_t *client)
{
BSON_ASSERT (client);
return client->read_prefs;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_set_read_prefs --
*
* Set the default read preferences for @client.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
void
mongoc_client_set_read_prefs (mongoc_client_t *client,
const mongoc_read_prefs_t *read_prefs)
{
BSON_ASSERT (client);
if (read_prefs != client->read_prefs) {
if (client->read_prefs) {
mongoc_read_prefs_destroy(client->read_prefs);
}
client->read_prefs = read_prefs ?
mongoc_read_prefs_copy(read_prefs) :
mongoc_read_prefs_new(MONGOC_READ_PRIMARY);
}
}
mongoc_cursor_t *
mongoc_client_command (mongoc_client_t *client,
const char *db_name,
mongoc_query_flags_t flags,
uint32_t skip,
uint32_t limit,
uint32_t batch_size,
const bson_t *query,
const bson_t *fields,
const mongoc_read_prefs_t *read_prefs)
{
char ns[MONGOC_NAMESPACE_MAX];
BSON_ASSERT (client);
BSON_ASSERT (db_name);
BSON_ASSERT (query);
if (!read_prefs) {
read_prefs = client->read_prefs;
}
/*
* Allow a caller to provide a fully qualified namespace
*/
if (NULL == strstr (db_name, "$cmd")) {
bson_snprintf (ns, sizeof ns, "%s.$cmd", db_name);
db_name = ns;
}
return _mongoc_cursor_new (client, db_name, flags, skip, limit, batch_size,
true, query, fields, read_prefs, NULL);
}
/**
* mongoc_client_command_simple:
* @client: A mongoc_client_t.
* @db_name: The namespace, such as "admin".
* @command: The command to execute.
* @read_prefs: The read preferences or NULL.
* @reply: A location for the reply document or NULL.
* @error: A location for the error, or NULL.
*
* This wrapper around mongoc_client_command() aims to make it simpler to
* run a command and check the output result.
*
* false is returned if the command failed to be delivered or if the execution
* of the command failed. For example, a command that returns {'ok': 0} will
* result in this function returning false.
*
* To allow the caller to disambiguate between command execution failure and
* failure to send the command, reply will always be set if non-NULL. The
* caller should release this with bson_destroy().
*
* Returns: true if the command executed and resulted in success. Otherwise
* false and @error is set. @reply is always set, either to the resulting
* document or an empty bson document upon failure.
*/
bool
mongoc_client_command_simple (mongoc_client_t *client,
const char *db_name,
const bson_t *command,
const mongoc_read_prefs_t *read_prefs,
bson_t *reply,
bson_error_t *error)
{
mongoc_cluster_t *cluster;
mongoc_server_stream_t *server_stream;
mongoc_apply_read_prefs_result_t result = READ_PREFS_RESULT_INIT;
bool ret = false;
ENTRY;
BSON_ASSERT (client);
BSON_ASSERT (db_name);
BSON_ASSERT (command);
cluster = &client->cluster;
server_stream = mongoc_cluster_stream_for_reads (cluster, read_prefs, error);
if (!server_stream) {
if (reply) {
bson_init (reply);
}
GOTO (done);
}
apply_read_preferences (read_prefs, server_stream, command,
MONGOC_QUERY_NONE, &result);
ret = mongoc_cluster_run_command (cluster, server_stream->stream,
server_stream->sd->id,
result.flags, db_name,
result.query_with_read_prefs,
reply, error);
done:
mongoc_server_stream_cleanup (server_stream);
apply_read_prefs_result_cleanup (&result);
RETURN (ret);
}
void
_mongoc_client_kill_cursor (mongoc_client_t *client,
uint32_t server_id,
int64_t cursor_id,
const char *db,
const char *collection)
{
mongoc_server_stream_t *server_stream;
ENTRY;
BSON_ASSERT (client);
BSON_ASSERT (cursor_id);
/* don't attempt reconnect if server unavailable, and ignore errors */
server_stream = mongoc_cluster_stream_for_server (&client->cluster,
server_id,
false /* reconnect_ok */,
NULL /* error */);
if (!server_stream) {
return;
}
if (db && collection &&
server_stream->sd->max_wire_version >=
WIRE_VERSION_KILLCURSORS_CMD) {
_mongoc_client_killcursors_command (&client->cluster, server_stream,
cursor_id, db, collection);
} else {
_mongoc_client_op_killcursors (&client->cluster,
server_stream,
cursor_id);
}
mongoc_server_stream_cleanup (server_stream);
EXIT;
}
static void
_mongoc_client_op_killcursors (mongoc_cluster_t *cluster,
mongoc_server_stream_t *server_stream,
int64_t cursor_id)
{
mongoc_rpc_t rpc = { { 0 } };
rpc.kill_cursors.msg_len = 0;
rpc.kill_cursors.request_id = 0;
rpc.kill_cursors.response_to = 0;
rpc.kill_cursors.opcode = MONGOC_OPCODE_KILL_CURSORS;
rpc.kill_cursors.zero = 0;
rpc.kill_cursors.cursors = &cursor_id;
rpc.kill_cursors.n_cursors = 1;
mongoc_cluster_sendv_to_server (cluster, &rpc, 1, server_stream,
NULL, NULL);
}
static void
_mongoc_client_killcursors_command (mongoc_cluster_t *cluster,
mongoc_server_stream_t *server_stream,
int64_t cursor_id,
const char *db,
const char *collection)
{
bson_t command = BSON_INITIALIZER;
bson_t child;
bson_append_utf8 (&command, "killCursors", 11, collection, -1);
bson_append_array_begin (&command, "cursors", 7, &child);
bson_append_int64 (&child, "0", 1, cursor_id);
bson_append_array_end (&command, &child);
/* Find, getMore And killCursors Commands Spec: "The result from the
* killCursors command MAY be safely ignored."
*/
mongoc_cluster_run_command (cluster, server_stream->stream,
server_stream->sd->id,
MONGOC_QUERY_SLAVE_OK, db, &command,
NULL, NULL);
bson_destroy (&command);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_client_kill_cursor --
*
* Destroy a cursor on the server.
*
* NOTE: this is only reliable when connected to a single mongod or
* mongos. If connected to a replica set, the driver attempts to
* kill the cursor on the primary. If connected to multiple mongoses
* the kill-cursors message is sent to a *random* mongos.
*
* If no primary, mongos, or standalone server is known, return
* without attempting to reconnect.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
void
mongoc_client_kill_cursor (mongoc_client_t *client,
int64_t cursor_id)
{
mongoc_topology_t *topology;
mongoc_server_description_t *selected_server;
mongoc_read_prefs_t *read_prefs;
uint32_t server_id = 0;
topology = client->topology;
read_prefs = mongoc_read_prefs_new (MONGOC_READ_PRIMARY);
mongoc_mutex_lock (&topology->mutex);
/* see if there's a known writable server - do no I/O or retries */
selected_server = mongoc_topology_description_select(&topology->description,
MONGOC_SS_WRITE,
read_prefs,
15);
if (selected_server) {
server_id = selected_server->id;
}
mongoc_mutex_unlock (&topology->mutex);
if (server_id) {
_mongoc_client_kill_cursor (client, selected_server->id, cursor_id,
NULL /* db */,
NULL /* collection */);
} else {
MONGOC_INFO ("No server available for mongoc_client_kill_cursor");
}
mongoc_read_prefs_destroy (read_prefs);
}
char **
mongoc_client_get_database_names (mongoc_client_t *client,
bson_error_t *error)
{
bson_iter_t iter;
const char *name;
char **ret = NULL;
int i = 0;
mongoc_cursor_t *cursor;
const bson_t *doc;
BSON_ASSERT (client);
cursor = mongoc_client_find_databases (client, error);
while (mongoc_cursor_next (cursor, &doc)) {
if (bson_iter_init (&iter, doc) &&
bson_iter_find (&iter, "name") &&
BSON_ITER_HOLDS_UTF8 (&iter) &&
(name = bson_iter_utf8 (&iter, NULL)) &&
(0 != strcmp (name, "local"))) {
ret = (char **)bson_realloc (ret, sizeof(char*) * (i + 2));
ret [i] = bson_strdup (name);
ret [++i] = NULL;
}
}
if (!ret && !mongoc_cursor_error (cursor, error)) {
ret = (char **)bson_malloc0 (sizeof (void*));
}
mongoc_cursor_destroy (cursor);
return ret;
}
mongoc_cursor_t *
mongoc_client_find_databases (mongoc_client_t *client,
bson_error_t *error)
{
bson_t cmd = BSON_INITIALIZER;
mongoc_cursor_t *cursor;
BSON_ASSERT (client);
BSON_APPEND_INT32 (&cmd, "listDatabases", 1);
cursor = _mongoc_cursor_new (client, "admin", MONGOC_QUERY_SLAVE_OK,
0, 0, 0, true, NULL, NULL, NULL, NULL);
_mongoc_cursor_array_init (cursor, &cmd, "databases");
bson_destroy (&cmd);
return cursor;
}
int32_t
mongoc_client_get_max_message_size (mongoc_client_t *client) /* IN */
{
BSON_ASSERT (client);
return mongoc_cluster_get_max_msg_size (&client->cluster);
}
int32_t
mongoc_client_get_max_bson_size (mongoc_client_t *client) /* IN */
{
BSON_ASSERT (client);
return mongoc_cluster_get_max_bson_obj_size (&client->cluster);
}
bool
mongoc_client_get_server_status (mongoc_client_t *client, /* IN */
mongoc_read_prefs_t *read_prefs, /* IN */
bson_t *reply, /* OUT */
bson_error_t *error) /* OUT */
{
bson_t cmd = BSON_INITIALIZER;
bool ret = false;
BSON_ASSERT (client);
BSON_APPEND_INT32 (&cmd, "serverStatus", 1);
ret = mongoc_client_command_simple (client, "admin", &cmd, read_prefs,
reply, error);
bson_destroy (&cmd);
return ret;
}
void
mongoc_client_set_stream_initiator (mongoc_client_t *client,
mongoc_stream_initiator_t initiator,
void *user_data)
{
BSON_ASSERT (client);
if (!initiator) {
initiator = mongoc_client_default_stream_initiator;
user_data = client;
} else {
MONGOC_DEBUG ("Using custom stream initiator.");
}
client->initiator = initiator;
client->initiator_data = user_data;
if (client->topology->single_threaded) {
mongoc_topology_scanner_set_stream_initiator (client->topology->scanner,
initiator, user_data);
}
}
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-client.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-client.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cluster-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cluster-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cluster-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cluster-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cluster.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cluster.c
similarity index 98%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cluster.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cluster.c
index ed0050b8..929b68fa 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cluster.c
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cluster.c
@@ -1,2348 +1,2375 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "mongoc-config.h"
#ifdef MONGOC_ENABLE_SASL
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
#endif
#include <string.h>
#include "mongoc-cluster-private.h"
#include "mongoc-client-private.h"
#include "mongoc-counters-private.h"
#include "mongoc-config.h"
#include "mongoc-error.h"
#include "mongoc-host-list-private.h"
#include "mongoc-log.h"
#ifdef MONGOC_ENABLE_SASL
#include "mongoc-sasl-private.h"
#endif
#include "mongoc-b64-private.h"
#include "mongoc-scram-private.h"
#include "mongoc-set-private.h"
#include "mongoc-socket.h"
#include "mongoc-stream-private.h"
#include "mongoc-stream-socket.h"
#include "mongoc-thread-private.h"
#include "mongoc-topology-private.h"
#include "mongoc-trace.h"
#include "mongoc-util-private.h"
#include "mongoc-write-concern-private.h"
#include "mongoc-uri-private.h"
-
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-stream-tls.h"
+#endif
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "cluster"
#define CHECK_CLOSED_DURATION_MSEC 1000
#define DB_AND_CMD_FROM_COLLECTION(outstr, name) \
do { \
const char *dot = strchr(name, '.'); \
if (!dot || ((dot - name) > (sizeof outstr - 6))) { \
bson_snprintf(outstr, sizeof outstr, "admin.$cmd"); \
} else { \
memcpy(outstr, name, dot - name); \
memcpy(outstr + (dot - name), ".$cmd", 6); \
} \
} while (0)
static mongoc_server_stream_t *
mongoc_cluster_fetch_stream_single (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bool reconnect_ok,
bson_error_t *error);
static mongoc_server_stream_t *
mongoc_cluster_fetch_stream_pooled (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bool reconnect_ok,
bson_error_t *error);
static void
_bson_error_message_printf (bson_error_t *error,
const char *format,
...) BSON_GNUC_PRINTF (2, 3);
/* Allows caller to safely overwrite error->message with a formatted string,
* even if the formatted string includes original error->message. */
static void
_bson_error_message_printf (bson_error_t *error,
const char *format,
...)
{
va_list args;
char error_message[sizeof error->message];
if (error) {
va_start (args, format);
bson_vsnprintf (error_message, sizeof error->message, format, args);
va_end (args);
bson_strncpy (error->message, error_message, sizeof error->message);
}
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_run_command_rpc --
*
* Internal function to run a command on a given stream and
* read the response into @reply_rpc. @rpc and @reply_rpc can be
* the same to reuse storage. @buffer should be initialized before
* passing it in.
*
* Returns:
* true if successful; otherwise false and @error is set.
*
* Side effects:
* On success, @buffer and @reply_rpc are filled out with the reply.
* On failure, @error is filled out. If this was a network error
* and server_id is nonzero, the cluster disconnects from the server.
*
*--------------------------------------------------------------------------
*/
bool
mongoc_cluster_run_command_rpc (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
uint32_t server_id,
const char *command_name,
mongoc_rpc_t *rpc,
mongoc_rpc_t *reply_rpc,
mongoc_buffer_t *buffer,
bson_error_t *error)
{
mongoc_array_t ar;
int32_t msg_len;
bool error_set = false;
bool ret = false;
char db[MONGOC_NAMESPACE_MAX];
ENTRY;
BSON_ASSERT(cluster);
BSON_ASSERT(stream);
_mongoc_array_init (&ar, sizeof (mongoc_iovec_t));
if (cluster->client->in_exhaust) {
bson_set_error(error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_IN_EXHAUST,
"A cursor derived from this client is in exhaust.");
error_set = true;
GOTO (done);
}
rpc->query.request_id = ++cluster->request_id;
_mongoc_rpc_gather (rpc, &ar);
_mongoc_rpc_swab_to_le (rpc);
if (!_mongoc_stream_writev_full (stream, (mongoc_iovec_t *)ar.data, ar.len,
cluster->sockettimeoutms, error) ||
!_mongoc_buffer_append_from_stream (buffer, stream, 4,
cluster->sockettimeoutms, error)) {
mongoc_cluster_disconnect_node (cluster, server_id);
/* add info about the command to writev_full's error message */
_mongoc_get_db_name (rpc->query.collection, db);
_bson_error_message_printf (
error,
"Failed to send \"%s\" command with database \"%s\": %s",
command_name, db, error->message);
error_set = true;
GOTO (done);
}
BSON_ASSERT (buffer->len == 4);
memcpy (&msg_len, buffer->data, 4);
msg_len = BSON_UINT32_FROM_LE(msg_len);
if ((msg_len < 16) || (msg_len > MONGOC_DEFAULT_MAX_MSG_SIZE)) {
GOTO (done);
}
if (!_mongoc_buffer_append_from_stream (buffer, stream, (size_t) msg_len - 4,
cluster->sockettimeoutms, error)) {
error_set = true;
GOTO (done);
}
if (!_mongoc_rpc_scatter (reply_rpc, buffer->data, buffer->len)) {
GOTO (done);
}
_mongoc_rpc_swab_from_le (reply_rpc);
if (reply_rpc->header.opcode != MONGOC_OPCODE_REPLY) {
GOTO (done);
}
ret = true;
done:
_mongoc_array_destroy (&ar);
if (!ret && !error_set) {
/* generic error */
bson_set_error (error,
MONGOC_ERROR_PROTOCOL,
MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
"Invalid reply from server.");
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_run_command --
*
* Internal function to run a command on a given stream.
* @error and @reply are optional out-pointers.
*
* Returns:
* true if successful; otherwise false and @error is set.
*
* Side effects:
* @reply is set and should ALWAYS be released with bson_destroy().
* On failure, @error is filled out. If this was a network error
* and server_id is nonzero, the cluster disconnects from the server.
*
*--------------------------------------------------------------------------
*/
bool
mongoc_cluster_run_command (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
uint32_t server_id,
mongoc_query_flags_t flags,
const char *db_name,
const bson_t *command,
bson_t *reply,
bson_error_t *error)
{
char ns[MONGOC_NAMESPACE_MAX];
mongoc_rpc_t rpc;
bson_t reply_local;
bool ret = false;
bool reply_local_initialized = false;
mongoc_buffer_t buffer;
_mongoc_buffer_init (&buffer, NULL, 0, NULL, NULL);
bson_snprintf (ns, sizeof ns, "%s.$cmd", db_name);
_mongoc_rpc_prep_command (&rpc, ns, command, flags);
/* we can reuse the query rpc for the reply */
if (!mongoc_cluster_run_command_rpc (cluster, stream, server_id,
_mongoc_get_command_name (command),
&rpc, &rpc, &buffer, error)) {
GOTO (done);
}
/* static-init reply_local to point into buffer */
if (!_mongoc_rpc_reply_get_first(&rpc.reply, &reply_local)) {
bson_set_error (error,
MONGOC_ERROR_BSON,
MONGOC_ERROR_BSON_INVALID,
"Failed to decode reply BSON document.");
GOTO (done);
}
reply_local_initialized = true;
if (_mongoc_rpc_parse_command_error (&rpc, error)) {
GOTO (done);
}
ret = true;
done:
if (reply && reply_local_initialized) {
bson_copy_to (&reply_local, reply);
bson_destroy (&reply_local);
} else if (reply) {
bson_init (reply);
}
_mongoc_buffer_destroy (&buffer);
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_run_ismaster --
*
* Run an ismaster command on the given stream.
*
* Returns:
* True if ismaster ran successfully.
*
* Side effects:
* Makes a blocking I/O call and fills out @reply on success,
* or @error on failure.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_stream_run_ismaster (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
bson_t *reply,
bson_error_t *error)
{
bson_t command;
bool ret;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
BSON_ASSERT (reply);
BSON_ASSERT (error);
bson_init (&command);
bson_append_int32 (&command, "ismaster", 8, 1);
ret = mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
"admin", &command, reply, error);
bson_destroy (&command);
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_run_ismaster --
*
* Run an ismaster command for the given node and handle result.
*
* Returns:
* True if ismaster ran successfully, false otherwise.
*
* Side effects:
* Makes a blocking I/O call.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_run_ismaster (mongoc_cluster_t *cluster,
mongoc_cluster_node_t *node)
{
bson_t reply;
bson_error_t error;
bson_iter_t iter;
int num_fields = 0;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (node);
BSON_ASSERT (node->stream);
if (!_mongoc_stream_run_ismaster (cluster, node->stream, &reply, &error)) {
GOTO (failure);
}
bson_iter_init (&iter, &reply);
while (bson_iter_next (&iter)) {
num_fields++;
if (strcmp ("maxWriteBatchSize", bson_iter_key (&iter)) == 0) {
if (! BSON_ITER_HOLDS_INT32 (&iter)) goto failure;
node->max_write_batch_size = bson_iter_int32 (&iter);
} else if (strcmp ("minWireVersion", bson_iter_key (&iter)) == 0) {
if (! BSON_ITER_HOLDS_INT32 (&iter)) goto failure;
node->min_wire_version = bson_iter_int32 (&iter);
} else if (strcmp ("maxWireVersion", bson_iter_key (&iter)) == 0) {
if (! BSON_ITER_HOLDS_INT32 (&iter)) goto failure;
node->max_wire_version = bson_iter_int32 (&iter);
} else if (strcmp ("maxBsonObjSize", bson_iter_key (&iter)) == 0) {
if (! BSON_ITER_HOLDS_INT32 (&iter)) goto failure;
node->max_bson_obj_size = bson_iter_int32 (&iter);
} else if (strcmp ("maxMessageSizeBytes", bson_iter_key (&iter)) == 0) {
if (! BSON_ITER_HOLDS_INT32 (&iter)) goto failure;
node->max_msg_size = bson_iter_int32 (&iter);
}
}
if (num_fields == 0) goto failure;
/* TODO: run ismaster through the topology machinery? */
bson_destroy (&reply);
return true;
failure:
bson_destroy (&reply);
return false;
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_build_basic_auth_digest --
*
* Computes the Basic Authentication digest using the credentials
* configured for @cluster and the @nonce provided.
*
* The result should be freed by the caller using bson_free() when
* they are finished with it.
*
* Returns:
* A newly allocated string containing the digest.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static char *
_mongoc_cluster_build_basic_auth_digest (mongoc_cluster_t *cluster,
const char *nonce)
{
const char *username;
const char *password;
char *password_digest;
char *password_md5;
char *digest_in;
char *ret;
ENTRY;
/*
* The following generates the digest to be used for basic authentication
* with a MongoDB server. More information on the format can be found
* at the following location:
*
* http://docs.mongodb.org/meta-driver/latest/legacy/
* implement-authentication-in-driver/
*/
BSON_ASSERT(cluster);
BSON_ASSERT(cluster->uri);
username = mongoc_uri_get_username(cluster->uri);
password = mongoc_uri_get_password(cluster->uri);
password_digest = bson_strdup_printf("%s:mongo:%s", username, password);
password_md5 = _mongoc_hex_md5(password_digest);
digest_in = bson_strdup_printf("%s%s%s", nonce, username, password_md5);
ret = _mongoc_hex_md5(digest_in);
bson_free(digest_in);
bson_free(password_md5);
bson_free(password_digest);
RETURN(ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_auth_node_cr --
*
* Performs authentication of @node using the credentials provided
* when configuring the @cluster instance.
*
* This is the Challenge-Response mode of authentication.
*
* Returns:
* true if authentication was successful; otherwise false and
* @error is set.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_auth_node_cr (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
bson_error_t *error)
{
bson_iter_t iter;
const char *auth_source;
bson_t command = { 0 };
bson_t reply = { 0 };
char *digest;
char *nonce;
bool ret;
ENTRY;
BSON_ASSERT(cluster);
BSON_ASSERT(stream);
if (!(auth_source = mongoc_uri_get_auth_source(cluster->uri)) ||
(*auth_source == '\0')) {
auth_source = "admin";
}
/*
* To authenticate a node using basic authentication, we need to first
* get the nonce from the server. We use that to hash our password which
* is sent as a reply to the server. If everything went good we get a
* success notification back from the server.
*/
/*
* Execute the getnonce command to fetch the nonce used for generating
* md5 digest of our password information.
*/
bson_init (&command);
bson_append_int32 (&command, "getnonce", 8, 1);
if (!mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
auth_source, &command, &reply, error)) {
bson_destroy (&command);
bson_destroy (&reply);
RETURN (false);
}
bson_destroy (&command);
if (!bson_iter_init_find_case (&iter, &reply, "nonce")) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_GETNONCE,
"Invalid reply from getnonce");
bson_destroy (&reply);
RETURN (false);
}
/*
* Build our command to perform the authentication.
*/
nonce = bson_iter_dup_utf8(&iter, NULL);
digest = _mongoc_cluster_build_basic_auth_digest(cluster, nonce);
bson_init(&command);
bson_append_int32(&command, "authenticate", 12, 1);
bson_append_utf8(&command, "user", 4,
mongoc_uri_get_username(cluster->uri), -1);
bson_append_utf8(&command, "nonce", 5, nonce, -1);
bson_append_utf8(&command, "key", 3, digest, -1);
bson_destroy(&reply);
bson_free(nonce);
bson_free(digest);
/*
* Execute the authenticate command. mongoc_cluster_run_command
* checks for {ok: 1} in the response.
*/
ret = mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
auth_source, &command, &reply, error);
if (!ret) {
/* error->message is already set */
error->domain = MONGOC_ERROR_CLIENT;
error->code = MONGOC_ERROR_CLIENT_AUTHENTICATE;
}
bson_destroy (&command);
bson_destroy (&reply);
RETURN (ret);
}
#ifdef MONGOC_ENABLE_SASL
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_get_canonicalized_name --
*
* Query the node to get the canonicalized name. This may happen if
* the node has been accessed via an alias.
*
* The gssapi code will use this if canonicalizeHostname is true.
*
* Some underlying layers of krb might do this for us, but they can
* be disabled in krb.conf.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_get_canonicalized_name (mongoc_cluster_t *cluster, /* IN */
mongoc_stream_t *node_stream, /* IN */
char *name, /* OUT */
size_t namelen, /* IN */
bson_error_t *error) /* OUT */
{
mongoc_stream_t *stream;
mongoc_stream_t *tmp;
mongoc_socket_t *sock = NULL;
char *canonicalized;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (node_stream);
BSON_ASSERT (name);
/*
* Find the underlying socket used in the stream chain.
*/
for (stream = node_stream; stream;) {
if ((tmp = mongoc_stream_get_base_stream (stream))) {
stream = tmp;
continue;
}
break;
}
BSON_ASSERT (stream);
if (stream->type == MONGOC_STREAM_SOCKET) {
sock = mongoc_stream_socket_get_socket ((mongoc_stream_socket_t *)stream);
if (sock) {
canonicalized = mongoc_socket_getnameinfo (sock);
if (canonicalized) {
bson_snprintf (name, namelen, "%s", canonicalized);
bson_free (canonicalized);
RETURN (true);
}
}
}
RETURN (false);
}
#endif
#ifdef MONGOC_ENABLE_SASL
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_auth_node_sasl --
*
* Perform authentication for a cluster node using SASL. This is
* only supported for GSSAPI at the moment.
*
* Returns:
* true if successful; otherwise false and @error is set.
*
* Side effects:
* error may be set.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_auth_node_sasl (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
const char *hostname,
bson_error_t *error)
{
uint32_t buflen = 0;
mongoc_sasl_t sasl;
const bson_t *options;
bson_iter_t iter;
bool ret = false;
char real_name [BSON_HOST_NAME_MAX + 1];
const char *service_name;
const char *mechanism;
const char *tmpstr;
uint8_t buf[4096] = { 0 };
bson_t cmd;
bson_t reply;
int conv_id = 0;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
options = mongoc_uri_get_options (cluster->uri);
_mongoc_sasl_init (&sasl);
if ((mechanism = mongoc_uri_get_auth_mechanism (cluster->uri))) {
_mongoc_sasl_set_mechanism (&sasl, mechanism);
}
if (bson_iter_init_find_case (&iter, options, "gssapiservicename") &&
BSON_ITER_HOLDS_UTF8 (&iter) &&
(service_name = bson_iter_utf8 (&iter, NULL))) {
_mongoc_sasl_set_service_name (&sasl, service_name);
}
_mongoc_sasl_set_pass (&sasl, mongoc_uri_get_password (cluster->uri));
_mongoc_sasl_set_user (&sasl, mongoc_uri_get_username (cluster->uri));
/*
* If the URI requested canonicalizeHostname, we need to resolve the real
* hostname for the IP Address and pass that to the SASL layer. Some
* underlying GSSAPI layers will do this for us, but can be disabled in
* their config (krb.conf).
*
* This allows the consumer to specify canonicalizeHostname=true in the URI
* and have us do that for them.
*
* See CDRIVER-323 for more information.
*/
if (bson_iter_init_find_case (&iter, options, "canonicalizeHostname") &&
BSON_ITER_HOLDS_BOOL (&iter) &&
bson_iter_bool (&iter)) {
if (_mongoc_cluster_get_canonicalized_name (cluster, stream, real_name,
sizeof real_name, error)) {
_mongoc_sasl_set_service_host (&sasl, real_name);
} else {
_mongoc_sasl_set_service_host (&sasl, hostname);
}
} else {
_mongoc_sasl_set_service_host (&sasl, hostname);
}
for (;;) {
if (!_mongoc_sasl_step (&sasl, buf, buflen, buf, sizeof buf, &buflen, error)) {
goto failure;
}
bson_init (&cmd);
if (sasl.step == 1) {
BSON_APPEND_INT32 (&cmd, "saslStart", 1);
BSON_APPEND_UTF8 (&cmd, "mechanism", mechanism ? mechanism : "GSSAPI");
bson_append_utf8 (&cmd, "payload", 7, (const char *)buf, buflen);
BSON_APPEND_INT32 (&cmd, "autoAuthorize", 1);
} else {
BSON_APPEND_INT32 (&cmd, "saslContinue", 1);
BSON_APPEND_INT32 (&cmd, "conversationId", conv_id);
bson_append_utf8 (&cmd, "payload", 7, (const char *)buf, buflen);
}
MONGOC_INFO ("SASL: authenticating \"%s\" (step %d)",
mongoc_uri_get_username (cluster->uri),
sasl.step);
if (!mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
"$external", &cmd, &reply, error)) {
bson_destroy (&cmd);
bson_destroy (&reply);
goto failure;
}
bson_destroy (&cmd);
if (bson_iter_init_find (&iter, &reply, "done") &&
bson_iter_as_bool (&iter)) {
bson_destroy (&reply);
break;
}
if (!bson_iter_init_find (&iter, &reply, "conversationId") ||
!BSON_ITER_HOLDS_INT32 (&iter) ||
!(conv_id = bson_iter_int32 (&iter)) ||
!bson_iter_init_find (&iter, &reply, "payload") ||
!BSON_ITER_HOLDS_UTF8 (&iter)) {
MONGOC_INFO ("SASL: authentication failed for \"%s\"",
mongoc_uri_get_username (cluster->uri));
bson_destroy (&reply);
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"Received invalid SASL reply from MongoDB server.");
goto failure;
}
tmpstr = bson_iter_utf8 (&iter, &buflen);
if (buflen > sizeof buf) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"SASL reply from MongoDB is too large.");
bson_destroy (&reply);
goto failure;
}
memcpy (buf, tmpstr, buflen);
bson_destroy (&reply);
}
MONGOC_INFO ("SASL: \"%s\" authenticated",
mongoc_uri_get_username (cluster->uri));
ret = true;
failure:
_mongoc_sasl_destroy (&sasl);
return ret;
}
#endif
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_auth_node_plain --
*
* Perform SASL PLAIN authentication for @node. We do this manually
* instead of using the SASL module because its rather simplistic.
*
* Returns:
* true if successful; otherwise false and error is set.
*
* Side effects:
* error may be set.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_auth_node_plain (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
bson_error_t *error)
{
char buf[4096];
int buflen = 0;
const char *username;
const char *password;
bson_t b = BSON_INITIALIZER;
bson_t reply;
size_t len;
char *str;
bool ret;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
username = mongoc_uri_get_username (cluster->uri);
if (!username) {
username = "";
}
password = mongoc_uri_get_password (cluster->uri);
if (!password) {
password = "";
}
str = bson_strdup_printf ("%c%s%c%s", '\0', username, '\0', password);
len = strlen (username) + strlen (password) + 2;
buflen = mongoc_b64_ntop ((const uint8_t *) str, len, buf, sizeof buf);
bson_free (str);
if (buflen == -1) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"failed base64 encoding message");
return false;
}
BSON_APPEND_INT32 (&b, "saslStart", 1);
BSON_APPEND_UTF8 (&b, "mechanism", "PLAIN");
bson_append_utf8 (&b, "payload", 7, (const char *)buf, buflen);
BSON_APPEND_INT32 (&b, "autoAuthorize", 1);
ret = mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
"$external", &b, &reply, error);
if (!ret) {
/* error->message is already set */
error->domain = MONGOC_ERROR_CLIENT;
error->code = MONGOC_ERROR_CLIENT_AUTHENTICATE;
}
bson_destroy (&b);
bson_destroy (&reply);
return ret;
}
#ifdef MONGOC_ENABLE_SSL
static bool
_mongoc_cluster_auth_node_x509 (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
bson_error_t *error)
{
const char *username;
bson_t cmd;
bson_t reply;
bool ret;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
username = mongoc_uri_get_username (cluster->uri);
if (username) {
MONGOC_INFO ("X509: got username (%s) from URI", username);
} else {
if (!cluster->client->ssl_opts.pem_file) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"cannot determine username for "
"X-509 authentication.");
return false;
}
if (cluster->client->pem_subject) {
username = cluster->client->pem_subject;
MONGOC_INFO ("X509: got username (%s) from certificate", username);
}
}
bson_init (&cmd);
BSON_APPEND_INT32 (&cmd, "authenticate", 1);
BSON_APPEND_UTF8 (&cmd, "mechanism", "MONGODB-X509");
BSON_APPEND_UTF8 (&cmd, "user", username);
ret = mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
"$external", &cmd, &reply, error);
if (!ret) {
/* error->message is already set */
error->domain = MONGOC_ERROR_CLIENT;
error->code = MONGOC_ERROR_CLIENT_AUTHENTICATE;
}
bson_destroy (&cmd);
bson_destroy (&reply);
return ret;
}
#endif
#ifdef MONGOC_ENABLE_SSL
static bool
_mongoc_cluster_auth_node_scram (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
bson_error_t *error)
{
uint32_t buflen = 0;
mongoc_scram_t scram;
bson_iter_t iter;
bool ret = false;
const char *tmpstr;
const char *auth_source;
uint8_t buf[4096] = { 0 };
bson_t cmd;
bson_t reply;
int conv_id = 0;
bson_subtype_t btype;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
if (!(auth_source = mongoc_uri_get_auth_source(cluster->uri)) ||
(*auth_source == '\0')) {
auth_source = "admin";
}
_mongoc_scram_init(&scram);
_mongoc_scram_set_pass (&scram, mongoc_uri_get_password (cluster->uri));
_mongoc_scram_set_user (&scram, mongoc_uri_get_username (cluster->uri));
for (;;) {
if (!_mongoc_scram_step (&scram, buf, buflen, buf, sizeof buf, &buflen, error)) {
goto failure;
}
bson_init (&cmd);
if (scram.step == 1) {
BSON_APPEND_INT32 (&cmd, "saslStart", 1);
BSON_APPEND_UTF8 (&cmd, "mechanism", "SCRAM-SHA-1");
bson_append_binary (&cmd, "payload", 7, BSON_SUBTYPE_BINARY, buf, buflen);
BSON_APPEND_INT32 (&cmd, "autoAuthorize", 1);
} else {
BSON_APPEND_INT32 (&cmd, "saslContinue", 1);
BSON_APPEND_INT32 (&cmd, "conversationId", conv_id);
bson_append_binary (&cmd, "payload", 7, BSON_SUBTYPE_BINARY, buf, buflen);
}
MONGOC_INFO ("SCRAM: authenticating \"%s\" (step %d)",
mongoc_uri_get_username (cluster->uri),
scram.step);
if (!mongoc_cluster_run_command (cluster, stream, 0, MONGOC_QUERY_SLAVE_OK,
auth_source, &cmd, &reply, error)) {
bson_destroy (&cmd);
bson_destroy (&reply);
/* error->message is already set */
error->domain = MONGOC_ERROR_CLIENT;
error->code = MONGOC_ERROR_CLIENT_AUTHENTICATE;
goto failure;
}
bson_destroy (&cmd);
if (bson_iter_init_find (&iter, &reply, "done") &&
bson_iter_as_bool (&iter)) {
bson_destroy (&reply);
break;
}
if (!bson_iter_init_find (&iter, &reply, "conversationId") ||
!BSON_ITER_HOLDS_INT32 (&iter) ||
!(conv_id = bson_iter_int32 (&iter)) ||
!bson_iter_init_find (&iter, &reply, "payload") ||
!BSON_ITER_HOLDS_BINARY(&iter)) {
const char *errmsg = "Received invalid SCRAM reply from MongoDB server.";
MONGOC_INFO ("SCRAM: authentication failed for \"%s\"",
mongoc_uri_get_username (cluster->uri));
if (bson_iter_init_find (&iter, &reply, "errmsg") &&
BSON_ITER_HOLDS_UTF8 (&iter)) {
errmsg = bson_iter_utf8 (&iter, NULL);
}
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"%s", errmsg);
bson_destroy (&reply);
goto failure;
}
bson_iter_binary (&iter, &btype, &buflen, (const uint8_t**)&tmpstr);
if (buflen > sizeof buf) {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"SCRAM reply from MongoDB is too large.");
bson_destroy (&reply);
goto failure;
}
memcpy (buf, tmpstr, buflen);
bson_destroy (&reply);
}
MONGOC_INFO ("SCRAM: \"%s\" authenticated",
mongoc_uri_get_username (cluster->uri));
ret = true;
failure:
_mongoc_scram_destroy (&scram);
return ret;
}
#endif
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_auth_node --
*
* Authenticate a cluster node depending on the required mechanism.
*
* Returns:
* true if authenticated. false on failure and @error is set.
*
* Side effects:
* @error is set on failure.
*
*--------------------------------------------------------------------------
*/
static bool
_mongoc_cluster_auth_node (mongoc_cluster_t *cluster,
mongoc_stream_t *stream,
const char *hostname,
int32_t max_wire_version,
bson_error_t *error)
{
bool ret = false;
const char *mechanism;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (stream);
mechanism = mongoc_uri_get_auth_mechanism (cluster->uri);
/* Use cached max_wire_version, not value from sd */
if (!mechanism) {
if (max_wire_version < WIRE_VERSION_SCRAM_DEFAULT) {
mechanism = "MONGODB-CR";
} else {
mechanism = "SCRAM-SHA-1";
}
}
if (0 == strcasecmp (mechanism, "MONGODB-CR")) {
ret = _mongoc_cluster_auth_node_cr (cluster, stream, error);
} else if (0 == strcasecmp (mechanism, "MONGODB-X509")) {
#ifdef MONGOC_ENABLE_SSL
ret = _mongoc_cluster_auth_node_x509 (cluster, stream, error);
#else
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"The \"%s\" authentication mechanism requires libmongoc built with --enable-ssl",
mechanism);
#endif
} else if (0 == strcasecmp (mechanism, "SCRAM-SHA-1")) {
#ifdef MONGOC_ENABLE_SSL
ret = _mongoc_cluster_auth_node_scram (cluster, stream, error);
#else
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"The \"%s\" authentication mechanism requires libmongoc built with --enable-ssl",
mechanism);
#endif
} else if (0 == strcasecmp (mechanism, "GSSAPI")) {
#ifdef MONGOC_ENABLE_SASL
ret = _mongoc_cluster_auth_node_sasl (cluster, stream, hostname, error);
#else
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"The \"%s\" authentication mechanism requires libmongoc built with --enable-sasl",
mechanism);
#endif
} else if (0 == strcasecmp (mechanism, "PLAIN")) {
ret = _mongoc_cluster_auth_node_plain (cluster, stream, error);
} else {
bson_set_error (error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_AUTHENTICATE,
"Unknown authentication mechanism \"%s\".",
mechanism);
}
if (!ret) {
mongoc_counter_auth_failure_inc ();
MONGOC_DEBUG("Authentication failed: %s", error->message);
} else {
mongoc_counter_auth_success_inc ();
TRACE("%s", "Authentication succeeded");
}
RETURN(ret);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_disconnect_node --
*
* Remove a node from the set of nodes. This should be done if
* a stream in the set is found to be invalid.
*
* WARNING: pointers to a disconnected mongoc_cluster_node_t or
* its stream are now invalid, be careful of dangling pointers.
*
* Returns:
* None.
*
* Side effects:
* Removes node from cluster's set of nodes, and frees the
* mongoc_cluster_node_t if pooled.
*
*--------------------------------------------------------------------------
*/
void
mongoc_cluster_disconnect_node (mongoc_cluster_t *cluster, uint32_t server_id)
{
mongoc_topology_t *topology = cluster->client->topology;
ENTRY;
if (topology->single_threaded) {
mongoc_topology_scanner_node_t *scanner_node;
scanner_node = mongoc_topology_scanner_get_node (topology->scanner, server_id);
/* might never actually have connected */
if (scanner_node && scanner_node->stream) {
mongoc_topology_scanner_node_disconnect (scanner_node, true);
EXIT;
}
EXIT;
} else {
mongoc_set_rm(cluster->nodes, server_id);
}
EXIT;
}
static void
_mongoc_cluster_node_destroy (mongoc_cluster_node_t *node)
{
/* Failure, or Replica Set reconfigure without this node */
mongoc_stream_failed (node->stream);
bson_free (node);
}
static void
_mongoc_cluster_node_dtor (void *data_,
void *ctx_)
{
mongoc_cluster_node_t *node = (mongoc_cluster_node_t *)data_;
_mongoc_cluster_node_destroy (node);
}
static mongoc_cluster_node_t *
_mongoc_cluster_node_new (mongoc_stream_t *stream)
{
mongoc_cluster_node_t *node;
if (!stream) {
return NULL;
}
node = (mongoc_cluster_node_t *)bson_malloc0(sizeof *node);
node->stream = stream;
node->timestamp = bson_get_monotonic_time ();
node->max_wire_version = MONGOC_DEFAULT_WIRE_VERSION;
node->min_wire_version = MONGOC_DEFAULT_WIRE_VERSION;
node->max_write_batch_size = MONGOC_DEFAULT_WRITE_BATCH_SIZE;
node->max_bson_obj_size = MONGOC_DEFAULT_BSON_OBJ_SIZE;
node->max_msg_size = MONGOC_DEFAULT_MAX_MSG_SIZE;
return node;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_add_node --
*
* Add a new node to this cluster for the given server description.
*
* NOTE: does NOT check if this server is already in the cluster.
*
* Returns:
* A stream connected to the server, or NULL on failure.
*
* Side effects:
* Adds a cluster node, or sets error on failure.
*
*--------------------------------------------------------------------------
*/
static mongoc_stream_t *
_mongoc_cluster_add_node (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bson_error_t *error /* OUT */)
{
mongoc_cluster_node_t *cluster_node;
mongoc_stream_t *stream;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (!cluster->client->topology->single_threaded);
TRACE ("Adding new server to cluster: %s", sd->connection_address);
stream = _mongoc_client_create_stream(cluster->client, &sd->host, error);
if (!stream) {
MONGOC_WARNING ("Failed connection to %s (%s)", sd->connection_address, error->message);
RETURN (NULL);
}
/* take critical fields from a fresh ismaster */
cluster_node = _mongoc_cluster_node_new (stream);
if (!_mongoc_cluster_run_ismaster (cluster, cluster_node)) {
_mongoc_cluster_node_destroy (cluster_node);
MONGOC_WARNING ("Failed connection to %s (ismaster failed)", sd->connection_address);
RETURN (NULL);
}
if (cluster->requires_auth) {
if (!_mongoc_cluster_auth_node (cluster, cluster_node->stream, sd->host.host,
cluster_node->max_wire_version, error)) {
MONGOC_WARNING ("Failed authentication to %s (%s)", sd->connection_address, error->message);
_mongoc_cluster_node_destroy (cluster_node);
RETURN (NULL);
}
}
mongoc_set_add (cluster->nodes, sd->id, cluster_node);
RETURN (stream);
}
static void
node_not_found (mongoc_server_description_t *sd,
bson_error_t *error /* OUT */)
{
if (sd->error.code) {
memcpy (error, &sd->error, sizeof *error);
} else {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
"Could not find node %s",
sd->host.host_and_port);
}
}
static void
stream_not_found (mongoc_server_description_t *sd,
bson_error_t *error /* OUT */)
{
if (sd->error.code) {
memcpy (error, &sd->error, sizeof *error);
} else {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
"Could not find stream for node %s",
sd->host.host_and_port);
}
}
static mongoc_server_stream_t *
_mongoc_cluster_stream_for_server_description (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bool reconnect_ok,
bson_error_t *error)
{
mongoc_topology_t *topology;
mongoc_server_stream_t *server_stream;
ENTRY;
topology = cluster->client->topology;
/* in the single-threaded use case we share topology's streams */
if (topology->single_threaded) {
server_stream = mongoc_cluster_fetch_stream_single (cluster,
sd,
reconnect_ok,
error);
} else {
server_stream = mongoc_cluster_fetch_stream_pooled (cluster,
sd,
reconnect_ok,
error);
}
if (!server_stream) {
/* failed */
mongoc_cluster_disconnect_node (cluster, sd->id);
}
RETURN (server_stream);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_stream_for_server --
*
* Fetch the stream for @server_id. If @reconnect_ok and there is no
* valid stream, attempts to reconnect; if not @reconnect_ok then only
* an existing stream can be returned, or NULL.
*
* Returns:
* A mongoc_server_stream_t, or NULL
*
* Side effects:
* May add a node or reconnect one, if @reconnect_ok.
* Authenticates the stream if needed.
* May set @error.
*
*--------------------------------------------------------------------------
*/
mongoc_server_stream_t *
mongoc_cluster_stream_for_server (mongoc_cluster_t *cluster,
uint32_t server_id,
bool reconnect_ok,
bson_error_t *error)
{
mongoc_topology_t *topology;
mongoc_server_description_t *sd;
mongoc_server_stream_t *server_stream = NULL;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (server_id);
topology = cluster->client->topology;
if (!(sd = mongoc_topology_server_by_id (topology, server_id, error))) {
RETURN (NULL);
}
server_stream = _mongoc_cluster_stream_for_server_description (cluster,
sd,
reconnect_ok,
error);
if (!server_stream) {
/* failed */
mongoc_cluster_disconnect_node (cluster, server_id);
mongoc_server_description_destroy (sd);
}
RETURN (server_stream);
}
static mongoc_server_stream_t *
mongoc_cluster_fetch_stream_single (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bool reconnect_ok,
bson_error_t *error)
{
mongoc_topology_t *topology;
mongoc_stream_t *stream;
mongoc_topology_scanner_node_t *scanner_node;
+ int64_t timeout_ms;
int64_t expire_at;
bson_t reply;
topology = cluster->client->topology;
+ timeout_ms = topology->connect_timeout_msec;
scanner_node = mongoc_topology_scanner_get_node (topology->scanner, sd->id);
BSON_ASSERT (scanner_node && !scanner_node->retired);
stream = scanner_node->stream;
if (!stream) {
if (!reconnect_ok) {
stream_not_found (sd, error);
return NULL;
}
if (!mongoc_topology_scanner_node_setup (scanner_node, error)) {
return NULL;
}
stream = scanner_node->stream;
- expire_at = bson_get_monotonic_time() + topology->connect_timeout_msec * 1000;
+ expire_at = bson_get_monotonic_time() + timeout_ms * 1000;
+
if (!mongoc_stream_wait (stream, expire_at)) {
bson_set_error (error,
MONGOC_ERROR_STREAM,
MONGOC_ERROR_STREAM_CONNECT,
"Failed to connect to target host: '%s'",
sd->host.host_and_port);
memcpy (&sd->error, error, sizeof sd->error);
mongoc_topology_scanner_node_disconnect (scanner_node, true);
return NULL;
}
+#ifdef MONGOC_ENABLE_SSL
+ if (scanner_node->ts->ssl_opts) {
+ if (!mongoc_stream_tls_do_handshake (stream, (int32_t) timeout_ms)) {
+ bson_set_error (error,
+ MONGOC_ERROR_STREAM,
+ MONGOC_ERROR_STREAM_SOCKET,
+ "TLS handshake failed.");
+ mongoc_topology_scanner_node_disconnect (scanner_node, true);
+ return NULL;
+ }
+
+ if (!mongoc_stream_tls_check_cert (stream, scanner_node->host.host)) {
+ bson_set_error (error,
+ MONGOC_ERROR_STREAM,
+ MONGOC_ERROR_STREAM_SOCKET,
+ "Failed to verify peer certificate.");
+ mongoc_topology_scanner_node_disconnect (scanner_node, true);
+ return NULL;
+ }
+ }
+#endif
+
if (!_mongoc_stream_run_ismaster (cluster, stream, &reply, error)) {
mongoc_topology_scanner_node_disconnect (scanner_node, true);
return NULL;
}
/* TODO: run ismaster through the topology machinery? */
bson_destroy (&reply);
}
/* if stream exists but isn't authed, a disconnect happened */
if (cluster->requires_auth && !scanner_node->has_auth) {
/* In single-threaded mode, we can use sd's max_wire_version */
if (!_mongoc_cluster_auth_node (cluster, stream, sd->host.host,
sd->max_wire_version, &sd->error)) {
memcpy (error, &sd->error, sizeof *error);
return NULL;
}
scanner_node->has_auth = true;
}
return mongoc_server_stream_new (topology->description.type, sd, stream);
}
static mongoc_server_stream_t *
mongoc_cluster_fetch_stream_pooled (mongoc_cluster_t *cluster,
mongoc_server_description_t *sd,
bool reconnect_ok,
bson_error_t *error)
{
mongoc_topology_t *topology;
mongoc_stream_t *stream;
mongoc_cluster_node_t *cluster_node;
int64_t timestamp;
cluster_node = (mongoc_cluster_node_t *) mongoc_set_get (cluster->nodes,
sd->id);
topology = cluster->client->topology;
if (cluster_node) {
BSON_ASSERT (cluster_node->stream);
/* existing cluster node, is it outdated? */
timestamp = mongoc_topology_server_timestamp (topology, sd->id);
if (timestamp == -1 || cluster_node->timestamp < timestamp) {
mongoc_cluster_disconnect_node (cluster, sd->id);
} else {
/* TODO: thread safety! */
return mongoc_server_stream_new (topology->description.type,
sd, cluster_node->stream);
}
}
/* no node, or out of date */
if (!reconnect_ok) {
node_not_found (sd, error);
return NULL;
}
stream = _mongoc_cluster_add_node (cluster, sd, error);
if (stream) {
/* TODO: thread safety! */
return mongoc_server_stream_new (topology->description.type,
sd, stream);
} else {
return NULL;
}
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_init --
*
* Initializes @cluster using the @uri and @client provided. The
* @uri is used to determine the "mode" of the cluster. Based on the
* uri we can determine if we are connected to a single host, a
* replicaSet, or a shardedCluster.
*
* Returns:
* None.
*
* Side effects:
* @cluster is initialized.
*
*--------------------------------------------------------------------------
*/
void
mongoc_cluster_init (mongoc_cluster_t *cluster,
const mongoc_uri_t *uri,
void *client)
{
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (uri);
memset (cluster, 0, sizeof *cluster);
cluster->uri = mongoc_uri_copy(uri);
cluster->client = (mongoc_client_t *)client;
cluster->requires_auth = (mongoc_uri_get_username(uri) ||
mongoc_uri_get_auth_mechanism(uri));
cluster->sockettimeoutms = mongoc_uri_get_option_as_int32(
uri, "sockettimeoutms", MONGOC_DEFAULT_SOCKETTIMEOUTMS);
cluster->socketcheckintervalms = mongoc_uri_get_option_as_int32(
uri, "socketcheckintervalms", MONGOC_TOPOLOGY_SOCKET_CHECK_INTERVAL_MS);
/* TODO for single-threaded case we don't need this */
cluster->nodes = mongoc_set_new(8, _mongoc_cluster_node_dtor, NULL);
_mongoc_array_init (&cluster->iov, sizeof (mongoc_iovec_t));
EXIT;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_destroy --
*
* Clean up after @cluster and destroy all active connections.
* All resources for @cluster are released.
*
* Returns:
* None.
*
* Side effects:
* Everything.
*
*--------------------------------------------------------------------------
*/
void
mongoc_cluster_destroy (mongoc_cluster_t *cluster) /* INOUT */
{
ENTRY;
BSON_ASSERT (cluster);
mongoc_uri_destroy(cluster->uri);
mongoc_set_destroy(cluster->nodes);
_mongoc_array_destroy(&cluster->iov);
EXIT;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_stream_for_optype --
*
* Internal server selection.
*
* Returns:
* A mongoc_server_stream_t on which you must call
* mongoc_server_stream_cleanup, or NULL on failure (sets @error)
*
* Side effects:
* May set @error.
* May add new nodes to @cluster->nodes.
*
*--------------------------------------------------------------------------
*/
static mongoc_server_stream_t *
_mongoc_cluster_stream_for_optype (mongoc_cluster_t *cluster,
mongoc_ss_optype_t optype,
const mongoc_read_prefs_t *read_prefs,
bson_error_t *error)
{
mongoc_server_stream_t *server_stream;
mongoc_server_description_t *selected_server;
mongoc_topology_t *topology = cluster->client->topology;
ENTRY;
BSON_ASSERT (cluster);
/* this is a new copy of the server description */
selected_server = mongoc_topology_select (topology,
optype,
read_prefs,
15,
error);
if (!selected_server) {
RETURN(NULL);
}
/* connect or reconnect to server if necessary */
server_stream = _mongoc_cluster_stream_for_server_description (
cluster, selected_server,
true /* reconnect_ok */, error);
if (!server_stream ) {
mongoc_server_description_destroy (selected_server);
RETURN (NULL);
}
RETURN (server_stream);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_stream_for_reads --
*
* Internal server selection.
*
* Returns:
* A mongoc_server_stream_t on which you must call
* mongoc_server_stream_cleanup, or NULL on failure (sets @error)
*
* Side effects:
* May set @error.
* May add new nodes to @cluster->nodes.
*
*--------------------------------------------------------------------------
*/
mongoc_server_stream_t *
mongoc_cluster_stream_for_reads (mongoc_cluster_t *cluster,
const mongoc_read_prefs_t *read_prefs,
bson_error_t *error)
{
return _mongoc_cluster_stream_for_optype (cluster, MONGOC_SS_READ,
read_prefs, error);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_stream_for_writes --
*
* Get a stream for write operations.
*
* Returns:
* A mongoc_server_stream_t on which you must call
* mongoc_server_stream_cleanup, or NULL on failure (sets @error)
*
* Side effects:
* May set @error.
* May add new nodes to @cluster->nodes.
*
*--------------------------------------------------------------------------
*/
mongoc_server_stream_t *
mongoc_cluster_stream_for_writes (mongoc_cluster_t *cluster,
bson_error_t *error)
{
return _mongoc_cluster_stream_for_optype (cluster, MONGOC_SS_WRITE,
NULL, error);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_inc_egress_rpc --
*
* Helper to increment the counter for a particular RPC based on
* it's opcode.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static BSON_INLINE void
_mongoc_cluster_inc_egress_rpc (const mongoc_rpc_t *rpc)
{
mongoc_counter_op_egress_total_inc();
switch (rpc->header.opcode) {
case MONGOC_OPCODE_DELETE:
mongoc_counter_op_egress_delete_inc();
break;
case MONGOC_OPCODE_UPDATE:
mongoc_counter_op_egress_update_inc();
break;
case MONGOC_OPCODE_INSERT:
mongoc_counter_op_egress_insert_inc();
break;
case MONGOC_OPCODE_KILL_CURSORS:
mongoc_counter_op_egress_killcursors_inc();
break;
case MONGOC_OPCODE_GET_MORE:
mongoc_counter_op_egress_getmore_inc();
break;
case MONGOC_OPCODE_REPLY:
mongoc_counter_op_egress_reply_inc();
break;
case MONGOC_OPCODE_MSG:
mongoc_counter_op_egress_msg_inc();
break;
case MONGOC_OPCODE_QUERY:
mongoc_counter_op_egress_query_inc();
break;
default:
BSON_ASSERT(false);
break;
}
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_cluster_inc_ingress_rpc --
*
* Helper to increment the counter for a particular RPC based on
* it's opcode.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static BSON_INLINE void
_mongoc_cluster_inc_ingress_rpc (const mongoc_rpc_t *rpc)
{
mongoc_counter_op_ingress_total_inc ();
switch (rpc->header.opcode) {
case MONGOC_OPCODE_DELETE:
mongoc_counter_op_ingress_delete_inc ();
break;
case MONGOC_OPCODE_UPDATE:
mongoc_counter_op_ingress_update_inc ();
break;
case MONGOC_OPCODE_INSERT:
mongoc_counter_op_ingress_insert_inc ();
break;
case MONGOC_OPCODE_KILL_CURSORS:
mongoc_counter_op_ingress_killcursors_inc ();
break;
case MONGOC_OPCODE_GET_MORE:
mongoc_counter_op_ingress_getmore_inc ();
break;
case MONGOC_OPCODE_REPLY:
mongoc_counter_op_ingress_reply_inc ();
break;
case MONGOC_OPCODE_MSG:
mongoc_counter_op_ingress_msg_inc ();
break;
case MONGOC_OPCODE_QUERY:
mongoc_counter_op_ingress_query_inc ();
break;
default:
BSON_ASSERT (false);
break;
}
}
static bool
_mongoc_cluster_min_of_max_obj_size_sds (void *item,
void *ctx)
{
mongoc_server_description_t *sd = (mongoc_server_description_t *)item;
int32_t *current_min = (int32_t *)ctx;
if (sd->max_bson_obj_size < *current_min) {
*current_min = sd->max_bson_obj_size;
}
return true;
}
static bool
_mongoc_cluster_min_of_max_obj_size_nodes (void *item,
void *ctx)
{
mongoc_cluster_node_t *node = (mongoc_cluster_node_t *)item;
int32_t *current_min = (int32_t *)ctx;
if (node->max_bson_obj_size < *current_min) {
*current_min = node->max_bson_obj_size;
}
return true;
}
static bool
_mongoc_cluster_min_of_max_msg_size_sds (void *item,
void *ctx)
{
mongoc_server_description_t *sd = (mongoc_server_description_t *)item;
int32_t *current_min = (int32_t *)ctx;
if (sd->max_msg_size < *current_min) {
*current_min = sd->max_msg_size;
}
return true;
}
static bool
_mongoc_cluster_min_of_max_msg_size_nodes (void *item,
void *ctx)
{
mongoc_cluster_node_t *node = (mongoc_cluster_node_t *)item;
int32_t *current_min = (int32_t *)ctx;
if (node->max_msg_size < *current_min) {
*current_min = node->max_msg_size;
}
return true;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_get_max_bson_obj_size --
*
* Return the minimum max_bson_obj_size across all servers in cluster.
*
* NOTE: this method uses the topology's mutex.
*
* Returns:
* The minimum max_bson_obj_size.
*
* Side effects:
* None
*
*--------------------------------------------------------------------------
*/
int32_t
mongoc_cluster_get_max_bson_obj_size (mongoc_cluster_t *cluster)
{
int32_t max_bson_obj_size = -1;
max_bson_obj_size = MONGOC_DEFAULT_BSON_OBJ_SIZE;
if (!cluster->client->topology->single_threaded) {
mongoc_set_for_each (cluster->nodes,
_mongoc_cluster_min_of_max_obj_size_nodes,
&max_bson_obj_size);
} else {
mongoc_set_for_each (cluster->client->topology->description.servers,
_mongoc_cluster_min_of_max_obj_size_sds,
&max_bson_obj_size);
}
return max_bson_obj_size;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_get_max_msg_size --
*
* Return the minimum max msg size across all servers in cluster.
*
* NOTE: this method uses the topology's mutex.
*
* Returns:
* The minimum max_msg_size
*
* Side effects:
* None
*
*--------------------------------------------------------------------------
*/
int32_t
mongoc_cluster_get_max_msg_size (mongoc_cluster_t *cluster)
{
int32_t max_msg_size = MONGOC_DEFAULT_MAX_MSG_SIZE;
if (!cluster->client->topology->single_threaded) {
mongoc_set_for_each (cluster->nodes,
_mongoc_cluster_min_of_max_msg_size_nodes,
&max_msg_size);
} else {
mongoc_set_for_each (cluster->client->topology->description.servers,
_mongoc_cluster_min_of_max_msg_size_sds,
&max_msg_size);
}
return max_msg_size;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_node_min_wire_version --
*
* Return the min wire version for the given server.
*
* Returns:
* Min wire version, or -1 if server is not found.
*
*--------------------------------------------------------------------------
*/
int32_t
mongoc_cluster_node_min_wire_version (mongoc_cluster_t *cluster,
uint32_t server_id)
{
mongoc_server_description_t *sd;
mongoc_cluster_node_t *node;
if (cluster->client->topology->single_threaded) {
if ((sd = mongoc_topology_description_server_by_id (
&cluster->client->topology->description, server_id, NULL))) {
return sd->min_wire_version;
}
} else {
if((node = (mongoc_cluster_node_t *)mongoc_set_get(cluster->nodes, server_id))) {
return node->min_wire_version;
}
}
return -1;
}
static bool
_mongoc_cluster_check_interval (mongoc_cluster_t *cluster,
uint32_t server_id,
bson_error_t *error)
{
mongoc_topology_t *topology;
mongoc_topology_scanner_node_t *scanner_node;
mongoc_server_description_t *sd;
mongoc_stream_t *stream;
int64_t now;
int64_t before_ismaster;
bson_t command;
bson_t reply;
bool r;
topology = cluster->client->topology;
if (!topology->single_threaded) {
return true;
}
scanner_node =
mongoc_topology_scanner_get_node (topology->scanner, server_id);
if (!scanner_node) {
return false;
}
BSON_ASSERT (!scanner_node->retired);
stream = scanner_node->stream;
if (!stream) {
return false;
}
now = bson_get_monotonic_time ();
if (scanner_node->last_used + (1000 * CHECK_CLOSED_DURATION_MSEC) < now) {
if (mongoc_stream_check_closed (stream)) {
mongoc_cluster_disconnect_node (cluster, server_id);
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_SOCKET,
"Stream is closed");
return false;
}
}
if (scanner_node->last_used + (1000 * cluster->socketcheckintervalms) <
now) {
bson_init (&command);
BSON_APPEND_INT32 (&command, "ismaster", 1);
before_ismaster = now;
r = mongoc_cluster_run_command (cluster, stream, server_id,
MONGOC_QUERY_SLAVE_OK, "admin", &command,
&reply, error);
now = bson_get_monotonic_time ();
bson_destroy (&command);
if (r) {
sd = mongoc_topology_description_server_by_id (&topology->description,
server_id, NULL);
if (!sd) {
bson_destroy (&reply);
return false;
}
mongoc_topology_description_handle_ismaster (
&topology->description, sd, &reply,
(now - before_ismaster) / 1000, /* RTT_MS */
error);
bson_destroy (&reply);
} else {
bson_destroy (&reply);
return false;
}
}
return true;
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_sendv_to_server --
*
* Sends the given RPCs to the given server.
*
* Returns:
* True if successful.
*
* Side effects:
* @rpcs may be mutated and should be considered invalid after calling
* this method.
*
* @error may be set.
*
*--------------------------------------------------------------------------
*/
bool
mongoc_cluster_sendv_to_server (mongoc_cluster_t *cluster,
mongoc_rpc_t *rpcs,
size_t rpcs_len,
mongoc_server_stream_t *server_stream,
const mongoc_write_concern_t *write_concern,
bson_error_t *error)
{
uint32_t server_id;
mongoc_iovec_t *iov;
mongoc_topology_scanner_node_t *scanner_node;
const bson_t *b;
mongoc_rpc_t gle;
size_t iovcnt;
size_t i;
bool need_gle;
char cmdname[140];
int32_t max_msg_size;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (rpcs);
BSON_ASSERT (rpcs_len);
BSON_ASSERT (server_stream);
server_id = server_stream->sd->id;
if (cluster->client->in_exhaust) {
bson_set_error(error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_IN_EXHAUST,
"A cursor derived from this client is in exhaust.");
RETURN(false);
}
if (! write_concern) {
write_concern = cluster->client->write_concern;
}
if (!_mongoc_cluster_check_interval (cluster,
server_stream->sd->id,
error)) {
RETURN (false);
}
_mongoc_array_clear(&cluster->iov);
/*
* TODO: We can probably remove the need for sendv and just do send since
* we support write concerns now. Also, we clobber our getlasterror on
* each subsequent mutation. It's okay, since it comes out correct anyway,
* just useless work (and technically the request_id changes).
*/
for (i = 0; i < rpcs_len; i++) {
_mongoc_cluster_inc_egress_rpc (&rpcs[i]);
rpcs[i].header.request_id = ++cluster->request_id;
need_gle = _mongoc_rpc_needs_gle(&rpcs[i], write_concern);
_mongoc_rpc_gather (&rpcs[i], &cluster->iov);
max_msg_size = mongoc_server_stream_max_msg_size (server_stream);
if (rpcs[i].header.msg_len > max_msg_size) {
bson_set_error(error,
MONGOC_ERROR_CLIENT,
MONGOC_ERROR_CLIENT_TOO_BIG,
"Attempted to send an RPC larger than the "
"max allowed message size. Was %u, allowed %u.",
rpcs[i].header.msg_len,
max_msg_size);
RETURN(false);
}
if (need_gle) {
gle.query.msg_len = 0;
gle.query.request_id = ++cluster->request_id;
gle.query.response_to = 0;
gle.query.opcode = MONGOC_OPCODE_QUERY;
gle.query.flags = MONGOC_QUERY_NONE;
switch (rpcs[i].header.opcode) {
case MONGOC_OPCODE_INSERT:
DB_AND_CMD_FROM_COLLECTION(cmdname, rpcs[i].insert.collection);
break;
case MONGOC_OPCODE_DELETE:
DB_AND_CMD_FROM_COLLECTION(cmdname, rpcs[i].delete_.collection);
break;
case MONGOC_OPCODE_UPDATE:
DB_AND_CMD_FROM_COLLECTION(cmdname, rpcs[i].update.collection);
break;
default:
BSON_ASSERT(false);
DB_AND_CMD_FROM_COLLECTION(cmdname, "admin.$cmd");
break;
}
gle.query.collection = cmdname;
gle.query.skip = 0;
gle.query.n_return = 1;
b = _mongoc_write_concern_get_gle((mongoc_write_concern_t *)write_concern);
gle.query.query = bson_get_data(b);
gle.query.fields = NULL;
_mongoc_rpc_gather(&gle, &cluster->iov);
_mongoc_rpc_swab_to_le(&gle);
}
_mongoc_rpc_swab_to_le(&rpcs[i]);
}
iov = (mongoc_iovec_t *)cluster->iov.data;
iovcnt = cluster->iov.len;
BSON_ASSERT (cluster->iov.len);
if (!_mongoc_stream_writev_full (server_stream->stream, iov, iovcnt,
cluster->sockettimeoutms, error)) {
RETURN (false);
}
if (cluster->client->topology->single_threaded) {
scanner_node =
mongoc_topology_scanner_get_node (cluster->client->topology->scanner,
server_id);
if (scanner_node) {
scanner_node->last_used = bson_get_monotonic_time ();
}
}
RETURN (true);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_cluster_try_recv --
*
* Tries to receive the next event from the MongoDB server.
* The contents are loaded into @buffer and then
* scattered into the @rpc structure. @rpc is valid as long as
* @buffer contains the contents read into it.
*
* Callers that can optimize a reuse of @buffer should do so. It
* can save many memory allocations.
*
* Returns:
* True if successful.
*
* Side effects:
* @rpc is set on success, @error on failure.
* @buffer will be filled with the input data.
*
*--------------------------------------------------------------------------
*/
bool
mongoc_cluster_try_recv (mongoc_cluster_t *cluster,
mongoc_rpc_t *rpc,
mongoc_buffer_t *buffer,
mongoc_server_stream_t *server_stream,
bson_error_t *error)
{
uint32_t server_id;
int32_t msg_len;
int32_t max_msg_size;
off_t pos;
ENTRY;
BSON_ASSERT (cluster);
BSON_ASSERT (rpc);
BSON_ASSERT (buffer);
BSON_ASSERT (server_stream);
server_id = server_stream->sd->id;
TRACE ("Waiting for reply from server_id \"%u\"", server_id);
/*
* Buffer the message length to determine how much more to read.
*/
pos = buffer->len;
if (!_mongoc_buffer_append_from_stream (buffer, server_stream->stream, 4,
cluster->sockettimeoutms, error)) {
MONGOC_DEBUG("Could not read 4 bytes, stream probably closed or timed out");
mongoc_counter_protocol_ingress_error_inc ();
mongoc_cluster_disconnect_node(cluster, server_id);
RETURN (false);
}
/*
* Read the msg length from the buffer.
*/
memcpy (&msg_len, &buffer->data[buffer->off + pos], 4);
msg_len = BSON_UINT32_FROM_LE (msg_len);
max_msg_size = mongoc_server_stream_max_msg_size (server_stream);
if ((msg_len < 16) || (msg_len > max_msg_size)) {
bson_set_error (error,
MONGOC_ERROR_PROTOCOL,
MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
"Corrupt or malicious reply received.");
mongoc_cluster_disconnect_node(cluster, server_id);
mongoc_counter_protocol_ingress_error_inc ();
RETURN (false);
}
/*
* Read the rest of the message from the stream.
*/
if (!_mongoc_buffer_append_from_stream (buffer, server_stream->stream,
msg_len - 4,
cluster->sockettimeoutms, error)) {
mongoc_cluster_disconnect_node (cluster, server_id);
mongoc_counter_protocol_ingress_error_inc ();
RETURN (false);
}
/*
* Scatter the buffer into the rpc structure.
*/
if (!_mongoc_rpc_scatter (rpc, &buffer->data[buffer->off + pos], msg_len)) {
bson_set_error (error,
MONGOC_ERROR_PROTOCOL,
MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
"Failed to decode reply from server.");
mongoc_cluster_disconnect_node (cluster, server_id);
mongoc_counter_protocol_ingress_error_inc ();
RETURN (false);
}
_mongoc_rpc_swab_from_le (rpc);
_mongoc_cluster_inc_ingress_rpc (rpc);
RETURN(true);
}
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-collection.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-collection.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h
similarity index 87%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h
index 89c77b29..32cd2e2f 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h
@@ -1,69 +1,80 @@
/*
* Copyright 2013 MongoDB Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MONGOC_CONFIG_H
#define MONGOC_CONFIG_H
/*
* MONGOC_ENABLE_SSL is set from configure to determine if we are
* compiled with SSL support.
*/
#define MONGOC_ENABLE_SSL 1
#if MONGOC_ENABLE_SSL != 1
# undef MONGOC_ENABLE_SSL
#endif
/*
* MONGOC_ENABLE_SASL is set from configure to determine if we are
* compiled with SASL support.
*/
#define MONGOC_ENABLE_SASL 1
#if MONGOC_ENABLE_SASL != 1
# undef MONGOC_ENABLE_SASL
#endif
/*
* MONGOC_HAVE_SASL_CLIENT_DONE is set from configure to determine if we
* have SASL and its version is new enough to use sasl_client_done (),
* which supersedes sasl_done ().
*/
#define MONGOC_HAVE_SASL_CLIENT_DONE 1
#if MONGOC_HAVE_SASL_CLIENT_DONE != 1
# undef MONGOC_HAVE_SASL_CLIENT_DONE
#endif
/*
* MONGOC_HAVE_WEAK_SYMBOLS is set from configure to determine if the
* compiler supports the (weak) annotation. We use it to prevent
* Link-Time-Optimization (LTO) in our constant-time mongoc_memcmp()
* This is known to work with GNU GCC and Solaris Studio
*/
#define MONGOC_HAVE_WEAK_SYMBOLS 1
#if MONGOC_HAVE_WEAK_SYMBOLS != 1
# undef MONGOC_HAVE_WEAK_SYMBOLS
#endif
+/*
+ * Disable automatic calls to mongoc_init() and mongoc_cleanup()
+ * before main() is called, and after exit() (respectively).
+ */
+#define MONGOC_NO_AUTOMATIC_GLOBALS 1
+
+#if MONGOC_NO_AUTOMATIC_GLOBALS != 1
+# undef MONGOC_NO_AUTOMATIC_GLOBALS
+#endif
+
+
#endif /* MONGOC_CONFIG_H */
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h.in b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h.in
similarity index 86%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h.in
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h.in
index 89783698..c772a887 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-config.h.in
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-config.h.in
@@ -1,69 +1,80 @@
/*
* Copyright 2013 MongoDB Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MONGOC_CONFIG_H
#define MONGOC_CONFIG_H
/*
* MONGOC_ENABLE_SSL is set from configure to determine if we are
* compiled with SSL support.
*/
#define MONGOC_ENABLE_SSL @MONGOC_ENABLE_SSL@
#if MONGOC_ENABLE_SSL != 1
# undef MONGOC_ENABLE_SSL
#endif
/*
* MONGOC_ENABLE_SASL is set from configure to determine if we are
* compiled with SASL support.
*/
#define MONGOC_ENABLE_SASL @MONGOC_ENABLE_SASL@
#if MONGOC_ENABLE_SASL != 1
# undef MONGOC_ENABLE_SASL
#endif
/*
* MONGOC_HAVE_SASL_CLIENT_DONE is set from configure to determine if we
* have SASL and its version is new enough to use sasl_client_done (),
* which supersedes sasl_done ().
*/
#define MONGOC_HAVE_SASL_CLIENT_DONE @MONGOC_HAVE_SASL_CLIENT_DONE@
#if MONGOC_HAVE_SASL_CLIENT_DONE != 1
# undef MONGOC_HAVE_SASL_CLIENT_DONE
#endif
/*
* MONGOC_HAVE_WEAK_SYMBOLS is set from configure to determine if the
* compiler supports the (weak) annotation. We use it to prevent
* Link-Time-Optimization (LTO) in our constant-time mongoc_memcmp()
* This is known to work with GNU GCC and Solaris Studio
*/
#define MONGOC_HAVE_WEAK_SYMBOLS @MONGOC_HAVE_WEAK_SYMBOLS@
#if MONGOC_HAVE_WEAK_SYMBOLS != 1
# undef MONGOC_HAVE_WEAK_SYMBOLS
#endif
+/*
+ * Disable automatic calls to mongoc_init() and mongoc_cleanup()
+ * before main() is called, and after exit() (respectively).
+ */
+#define MONGOC_NO_AUTOMATIC_GLOBALS @MONGOC_NO_AUTOMATIC_GLOBALS@
+
+#if MONGOC_NO_AUTOMATIC_GLOBALS != 1
+# undef MONGOC_NO_AUTOMATIC_GLOBALS
+#endif
+
+
#endif /* MONGOC_CONFIG_H */
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters.defs b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters.defs
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-counters.defs
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-counters.defs
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-array.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-array.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-array.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-array.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-transform.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-cursor.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-cursor.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-database.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-database.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-errno-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-errno-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-errno-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-errno-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-error.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-error.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-error.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-error.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-flags.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-flags.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-flags.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-flags.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-gridfs.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-gridfs.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-host-list.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-host-list.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-index.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-index.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-index.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-index.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-index.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-index.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-index.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-index.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-init.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-init.c
similarity index 99%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-init.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-init.c
index 839190f3..4fa64e3b 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-init.c
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-init.c
@@ -1,171 +1,172 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <bson.h>
#include "mongoc-config.h"
#include "mongoc-counters-private.h"
#include "mongoc-init.h"
#ifdef MONGOC_ENABLE_SSL
# include "mongoc-scram-private.h"
# include "mongoc-ssl.h"
# include "mongoc-ssl-private.h"
#endif
#include "mongoc-thread-private.h"
#include "mongoc-trace.h"
#ifdef MONGOC_ENABLE_SASL
#include <sasl/sasl.h>
static void *
mongoc_sasl_mutex_alloc (void)
{
mongoc_mutex_t *mutex;
mutex = (mongoc_mutex_t *)bson_malloc0 (sizeof (mongoc_mutex_t));
mongoc_mutex_init (mutex);
return (void *) mutex;
}
static int
mongoc_sasl_mutex_lock (void *mutex)
{
mongoc_mutex_lock ((mongoc_mutex_t *) mutex);
return SASL_OK;
}
static int
mongoc_sasl_mutex_unlock (void *mutex)
{
mongoc_mutex_unlock ((mongoc_mutex_t *) mutex);
return SASL_OK;
}
static void
mongoc_sasl_mutex_free (void *mutex)
{
mongoc_mutex_destroy ((mongoc_mutex_t *) mutex);
bson_free (mutex);
}
#endif//MONGOC_ENABLE_SASL
static MONGOC_ONCE_FUN( _mongoc_do_init)
{
#ifdef MONGOC_ENABLE_SSL
_mongoc_ssl_init();
_mongoc_scram_startup();
#endif
#ifdef MONGOC_ENABLE_SASL
/* The following functions should not use tracing, as they may be invoked
* before mongoc_log_set_handler() can complete. */
sasl_set_mutex (mongoc_sasl_mutex_alloc,
mongoc_sasl_mutex_lock,
mongoc_sasl_mutex_unlock,
mongoc_sasl_mutex_free);
/* TODO: logging callback? */
sasl_client_init (NULL);
#endif
_mongoc_counters_init();
#ifdef _WIN32
{
WORD wVersionRequested;
WSADATA wsaData;
int err;
wVersionRequested = MAKEWORD (2, 2);
err = WSAStartup (wVersionRequested, &wsaData);
/* check the version perhaps? */
BSON_ASSERT (err == 0);
}
#endif
MONGOC_ONCE_RETURN;
}
void
mongoc_init (void)
{
static mongoc_once_t once = MONGOC_ONCE_INIT;
mongoc_once (&once, _mongoc_do_init);
}
static MONGOC_ONCE_FUN( _mongoc_do_cleanup)
{
#ifdef MONGOC_ENABLE_SSL
_mongoc_ssl_cleanup();
#endif
#ifdef MONGOC_ENABLE_SASL
#ifdef MONGOC_HAVE_SASL_CLIENT_DONE
sasl_client_done ();
#else
/* fall back to deprecated function */
sasl_done ();
#endif
#endif
#ifdef _WIN32
WSACleanup ();
#endif
_mongoc_counters_cleanup ();
MONGOC_ONCE_RETURN;
}
void
mongoc_cleanup (void)
{
static mongoc_once_t once = MONGOC_ONCE_INIT;
mongoc_once (&once, _mongoc_do_cleanup);
}
/*
* On GCC, just use __attribute__((constructor)) to perform initialization
* automatically for the application.
*/
#if defined(__GNUC__) && ! defined(MONGOC_NO_AUTOMATIC_GLOBALS)
static void _mongoc_init_ctor (void) __attribute__((constructor));
static void
_mongoc_init_ctor (void)
{
mongoc_init ();
}
static void _mongoc_init_dtor (void) __attribute__((destructor));
static void
_mongoc_init_dtor (void)
{
+ bson_mem_restore_vtable ();
mongoc_cleanup ();
}
#endif
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-init.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-init.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-init.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-init.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-iovec.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-iovec.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-iovec.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-iovec.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-list-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-list-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-list-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-list-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-list.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-list.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-list.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-list.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-log.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-log.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-op.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-op.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-op.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-op.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-matcher.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-matcher.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-memcmp-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-memcmp.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-memcmp.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-memcmp.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-memcmp.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-opcode.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-opcode.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-queue-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-queue-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-queue-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-queue-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-queue.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-queue.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-queue.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-queue.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rand.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rand.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-concern.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-concern.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-read-prefs.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-read-prefs.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rpc-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rpc-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rpc-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rpc-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rpc.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rpc.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-rpc.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-rpc.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-sasl-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-sasl-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-sasl-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-sasl-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-sasl.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-sasl.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-sasl.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-sasl.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-scram-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-scram-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-scram-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-scram-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-scram.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-scram.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-scram.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-scram.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-description.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-description.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-stream-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-stream.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-stream.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-server-stream.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-server-stream.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-set-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-set-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-set-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-set-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-set.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-set.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-set.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-set.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-socket.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-socket.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-ssl.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-ssl.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-buffered.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-buffered.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-file.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-file.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-file.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-file.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-file.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-file.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-file.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-file.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-socket.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-socket.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-socket.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-socket.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-socket.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-socket.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-socket.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-socket.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-tls.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-tls.c
similarity index 99%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-tls.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-tls.c
index 2d9e0ff6..d0836c51 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-tls.c
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-tls.c
@@ -1,1021 +1,1027 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "mongoc-config.h"
#ifdef MONGOC_ENABLE_SSL
#include <bson.h>
#include <errno.h>
#include <string.h>
#include <openssl/bio.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#ifdef _WIN32
# include <winsock2.h>
# include <winerror.h>
#endif
#include "mongoc-counters-private.h"
#include "mongoc-errno-private.h"
#include "mongoc-stream-tls.h"
#include "mongoc-stream-private.h"
#include "mongoc-ssl-private.h"
#include "mongoc-trace.h"
#include "mongoc-log.h"
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "stream-tls"
#define MONGOC_STREAM_TLS_BUFFER_SIZE 4096
/**
* mongoc_stream_tls_t:
*
* Private storage for handling callbacks from mongoc_stream and BIO_*
*
* The one funny wrinkle comes with timeout, which we use statefully to
* statefully pass timeouts through from the mongoc-stream api.
*
* TODO: is there a cleaner way to manage that?
*/
typedef struct
{
mongoc_stream_t parent;
mongoc_stream_t *base_stream;
BIO *bio;
SSL_CTX *ctx;
int32_t timeout_msec;
bool weak_cert_validation;
} mongoc_stream_tls_t;
static int
_mongoc_stream_tls_bio_create (BIO *b);
static int
_mongoc_stream_tls_bio_destroy (BIO *b);
static int
_mongoc_stream_tls_bio_read (BIO *b,
char *buf,
int len);
static int
_mongoc_stream_tls_bio_write (BIO *b,
const char *buf,
int len);
static long
_mongoc_stream_tls_bio_ctrl (BIO *b,
int cmd,
long num,
void *ptr);
static int
_mongoc_stream_tls_bio_gets (BIO *b,
char *buf,
int len);
static int
_mongoc_stream_tls_bio_puts (BIO *b,
const char *str);
/* Magic vtable to make our BIO shim */
static BIO_METHOD gMongocStreamTlsRawMethods = {
BIO_TYPE_FILTER,
"mongoc-stream-tls-glue",
_mongoc_stream_tls_bio_write,
_mongoc_stream_tls_bio_read,
_mongoc_stream_tls_bio_puts,
_mongoc_stream_tls_bio_gets,
_mongoc_stream_tls_bio_ctrl,
_mongoc_stream_tls_bio_create,
_mongoc_stream_tls_bio_destroy
};
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_create --
*
* BIO callback to create a new BIO instance.
*
* Returns:
* 1 if successful.
*
* Side effects:
* @b is initialized.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_create (BIO *b)
{
BSON_ASSERT (b);
b->init = 1;
b->num = 0;
b->ptr = NULL;
b->flags = 0;
return 1;
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_destroy --
*
* Release resources associated with BIO.
*
* Returns:
* 1 if successful.
*
* Side effects:
* @b is destroyed.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_destroy (BIO *b)
{
mongoc_stream_tls_t *tls;
BSON_ASSERT (b);
tls = (mongoc_stream_tls_t *)b->ptr;
if (!tls) {
return -1;
}
b->ptr = NULL;
b->init = 0;
b->flags = 0;
tls->bio = NULL;
return 1;
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_read --
*
* Read from the underlying stream to BIO.
*
* Returns:
* -1 on failure; otherwise the number of bytes read.
*
* Side effects:
* @buf is filled with data read from underlying stream.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_read (BIO *b,
char *buf,
int len)
{
mongoc_stream_tls_t *tls;
int ret;
BSON_ASSERT (b);
BSON_ASSERT (buf);
ENTRY;
tls = (mongoc_stream_tls_t *)b->ptr;
if (!tls) {
RETURN (-1);
}
errno = 0;
ret = (int)mongoc_stream_read (tls->base_stream, buf, len, 0,
tls->timeout_msec);
BIO_clear_retry_flags (b);
if ((ret <= 0) && MONGOC_ERRNO_IS_AGAIN (errno)) {
BIO_set_retry_read (b);
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_write --
*
* Write to the underlying stream on behalf of BIO.
*
* Returns:
* -1 on failure; otherwise the number of bytes written.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_write (BIO *b,
const char *buf,
int len)
{
mongoc_stream_tls_t *tls;
mongoc_iovec_t iov;
int ret;
ENTRY;
BSON_ASSERT (b);
BSON_ASSERT (buf);
tls = (mongoc_stream_tls_t *)b->ptr;
if (!tls) {
RETURN (-1);
}
iov.iov_base = (void *)buf;
iov.iov_len = len;
errno = 0;
TRACE("mongoc_stream_writev is expected to write: %d", len);
ret = (int)mongoc_stream_writev (tls->base_stream, &iov, 1,
tls->timeout_msec);
BIO_clear_retry_flags (b);
if (len > ret) {
TRACE("Returned short write: %d of %d", ret, len);
} else {
TRACE("Completed the %d", ret);
}
if (ret <= 0 && MONGOC_ERRNO_IS_AGAIN (errno)) {
TRACE("%s", "Requesting a retry");
BIO_set_retry_write (b);
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_ctrl --
*
* Handle ctrl callback for BIO.
*
* Returns:
* ioctl dependent.
*
* Side effects:
* ioctl dependent.
*
*--------------------------------------------------------------------------
*/
static long
_mongoc_stream_tls_bio_ctrl (BIO *b,
int cmd,
long num,
void *ptr)
{
switch (cmd) {
case BIO_CTRL_FLUSH:
return 1;
default:
return 0;
}
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_gets --
*
* BIO callback for gets(). Not supported.
*
* Returns:
* -1 always.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_gets (BIO *b,
char *buf,
int len)
{
return -1;
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_bio_puts --
*
* BIO callback to perform puts(). Just calls the actual write
* callback.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_bio_puts (BIO *b,
const char *str)
{
return _mongoc_stream_tls_bio_write (b, str, (int)strlen (str));
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_destroy --
*
* Cleanup after usage of a mongoc_stream_tls_t. Free all allocated
* resources and ensure connections are closed.
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static void
_mongoc_stream_tls_destroy (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
BIO_free_all (tls->bio);
tls->bio = NULL;
mongoc_stream_destroy (tls->base_stream);
tls->base_stream = NULL;
SSL_CTX_free (tls->ctx);
tls->ctx = NULL;
bson_free (stream);
mongoc_counter_streams_active_dec();
mongoc_counter_streams_disposed_inc();
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_failed --
*
* Called on stream failure. Same as _mongoc_stream_tls_destroy()
*
* Returns:
* None.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static void
_mongoc_stream_tls_failed (mongoc_stream_t *stream)
{
_mongoc_stream_tls_destroy (stream);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_close --
*
* Close the underlying socket.
*
* Linus dictates that you should not check the result of close()
* since there is a race condition with EAGAIN and a new file
* descriptor being opened.
*
* Returns:
* 0 on success; otherwise -1.
*
* Side effects:
* The BIO fd is closed.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_close (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
int ret = 0;
ENTRY;
BSON_ASSERT (tls);
ret = mongoc_stream_close (tls->base_stream);
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_flush --
*
* Flush the underlying stream.
*
* Returns:
* 0 if successful; otherwise -1.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_flush (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
return BIO_flush (tls->bio);
}
static ssize_t
_mongoc_stream_tls_write (mongoc_stream_tls_t *tls,
char *buf,
size_t buf_len)
{
ssize_t ret;
int64_t now;
int64_t expire = 0;
ENTRY;
BSON_ASSERT (tls);
BSON_ASSERT (buf);
BSON_ASSERT (buf_len);
if (tls->timeout_msec >= 0) {
expire = bson_get_monotonic_time () + (tls->timeout_msec * 1000UL);
}
ret = BIO_write (tls->bio, buf, buf_len);
TRACE("BIO_write returned %ld", ret);
TRACE("I got ret: %ld and retry: %d", ret, BIO_should_retry (tls->bio));
if (ret <= 0) {
return ret;
}
if (expire) {
now = bson_get_monotonic_time ();
if ((expire - now) < 0) {
if (ret < buf_len) {
mongoc_counter_streams_timeout_inc();
}
tls->timeout_msec = 0;
} else {
tls->timeout_msec = (expire - now) / 1000L;
}
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_writev --
*
* Write the iovec to the stream. This function will try to write
* all of the bytes or fail. If the number of bytes is not equal
* to the number requested, a failure or EOF has occurred.
*
* Returns:
* -1 on failure, otherwise the number of bytes written.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static ssize_t
_mongoc_stream_tls_writev (mongoc_stream_t *stream,
mongoc_iovec_t *iov,
size_t iovcnt,
int32_t timeout_msec)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
char buf[MONGOC_STREAM_TLS_BUFFER_SIZE];
ssize_t ret = 0;
ssize_t child_ret;
size_t i;
size_t iov_pos = 0;
/* There's a bit of a dance to coalesce vectorized writes into
* MONGOC_STREAM_TLS_BUFFER_SIZE'd writes to avoid lots of small tls
* packets.
*
* The basic idea is that we want to combine writes in the buffer if they're
* smaller than the buffer, flushing as it gets full. For larger writes, or
* the last write in the iovec array, we want to ignore the buffer and just
* write immediately. We take care of doing buffer writes by re-invoking
* ourself with a single iovec_t, pointing at our stack buffer.
*/
char *buf_head = buf;
char *buf_tail = buf;
char *buf_end = buf + MONGOC_STREAM_TLS_BUFFER_SIZE;
size_t bytes;
char *to_write = NULL;
size_t to_write_len;
BSON_ASSERT (tls);
BSON_ASSERT (iov);
BSON_ASSERT (iovcnt);
ENTRY;
tls->timeout_msec = timeout_msec;
for (i = 0; i < iovcnt; i++) {
iov_pos = 0;
while (iov_pos < iov[i].iov_len) {
if (buf_head != buf_tail ||
((i + 1 < iovcnt) &&
((buf_end - buf_tail) > (iov[i].iov_len - iov_pos)))) {
/* If we have either of:
* - buffered bytes already
* - another iovec to send after this one and we don't have more
* bytes to send than the size of the buffer.
*
* copy into the buffer */
bytes = BSON_MIN (iov[i].iov_len - iov_pos, buf_end - buf_tail);
memcpy (buf_tail, (char *) iov[i].iov_base + iov_pos, bytes);
buf_tail += bytes;
iov_pos += bytes;
if (buf_tail == buf_end) {
/* If we're full, request send */
to_write = buf_head;
to_write_len = buf_tail - buf_head;
buf_tail = buf_head = buf;
}
} else {
/* Didn't buffer, so just write it through */
to_write = (char *)iov[i].iov_base + iov_pos;
to_write_len = iov[i].iov_len - iov_pos;
iov_pos += to_write_len;
}
if (to_write) {
/* We get here if we buffered some bytes and filled the buffer, or
* if we didn't buffer and have to send out of the iovec */
child_ret = _mongoc_stream_tls_write (tls, to_write, to_write_len);
if (child_ret != to_write_len) {
TRACE("Got child_ret: %ld while to_write_len is: %ld",
child_ret, to_write_len);
}
if (child_ret < 0) {
TRACE("Returning what I had (%ld) as apposed to the error (%ld, errno:%d)", ret, child_ret, errno);
RETURN (ret);
}
ret += child_ret;
if (child_ret < to_write_len) {
/* we timed out, so send back what we could send */
RETURN (ret);
}
to_write = NULL;
}
}
}
if (buf_head != buf_tail) {
/* If we have any bytes buffered, send */
child_ret = _mongoc_stream_tls_write (tls, buf_head, buf_tail - buf_head);
if (child_ret < 0) {
RETURN (child_ret);
}
ret += child_ret;
}
if (ret >= 0) {
mongoc_counter_streams_egress_add (ret);
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_readv --
*
* Read from the stream into iov. This function will try to read
* all of the bytes or fail. If the number of bytes is not equal
* to the number requested, a failure or EOF has occurred.
*
* Returns:
* -1 on failure, 0 on EOF, otherwise the number of bytes read.
*
* Side effects:
* iov buffers will be written to.
*
*--------------------------------------------------------------------------
*/
static ssize_t
_mongoc_stream_tls_readv (mongoc_stream_t *stream,
mongoc_iovec_t *iov,
size_t iovcnt,
size_t min_bytes,
int32_t timeout_msec)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
ssize_t ret = 0;
size_t i;
int read_ret;
size_t iov_pos = 0;
int64_t now;
int64_t expire = 0;
ENTRY;
BSON_ASSERT (tls);
BSON_ASSERT (iov);
BSON_ASSERT (iovcnt);
tls->timeout_msec = timeout_msec;
if (timeout_msec >= 0) {
expire = bson_get_monotonic_time () + (timeout_msec * 1000UL);
}
for (i = 0; i < iovcnt; i++) {
iov_pos = 0;
while (iov_pos < iov[i].iov_len) {
read_ret = BIO_read (tls->bio, (char *)iov[i].iov_base + iov_pos,
(int)(iov[i].iov_len - iov_pos));
/* https://www.openssl.org/docs/crypto/BIO_should_retry.html:
*
* If BIO_should_retry() returns false then the precise "error
* condition" depends on the BIO type that caused it and the return
* code of the BIO operation. For example if a call to BIO_read() on a
* socket BIO returns 0 and BIO_should_retry() is false then the cause
* will be that the connection closed.
*/
if (read_ret < 0 || (read_ret == 0 && !BIO_should_retry (tls->bio))) {
return -1;
}
if (expire) {
now = bson_get_monotonic_time ();
if ((expire - now) < 0) {
if (read_ret == 0) {
mongoc_counter_streams_timeout_inc();
#ifdef _WIN32
errno = WSAETIMEDOUT;
#else
errno = ETIMEDOUT;
#endif
RETURN (-1);
}
tls->timeout_msec = 0;
} else {
tls->timeout_msec = (expire - now) / 1000L;
}
}
ret += read_ret;
if ((size_t)ret >= min_bytes) {
mongoc_counter_streams_ingress_add(ret);
RETURN (ret);
}
iov_pos += read_ret;
}
}
if (ret >= 0) {
mongoc_counter_streams_ingress_add(ret);
}
RETURN (ret);
}
/*
*--------------------------------------------------------------------------
*
* _mongoc_stream_tls_setsockopt --
*
* Perform a setsockopt on the underlying stream.
*
* Returns:
* -1 on failure, otherwise opt specific value.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
static int
_mongoc_stream_tls_setsockopt (mongoc_stream_t *stream,
int level,
int optname,
void *optval,
socklen_t optlen)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
return mongoc_stream_setsockopt (tls->base_stream,
level,
optname,
optval,
optlen);
}
/**
* mongoc_stream_tls_do_handshake:
*
* force an ssl handshake
*
* This will happen on the first read or write otherwise
*/
bool
mongoc_stream_tls_do_handshake (mongoc_stream_t *stream,
int32_t timeout_msec)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
tls->timeout_msec = timeout_msec;
if (BIO_do_handshake (tls->bio) == 1) {
return true;
}
if (!timeout_msec) {
return false;
}
if (!errno) {
#ifdef _WIN32
errno = WSAETIMEDOUT;
#else
errno = ETIMEDOUT;
#endif
}
return false;
}
/**
* mongoc_stream_tls_should_retry:
*
* If the stream should be retried
*/
bool
mongoc_stream_tls_should_retry (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
return BIO_should_retry (tls->bio);
}
/**
* mongoc_stream_tls_should_read:
*
* If the stream should read
*/
bool
mongoc_stream_tls_should_read (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
return BIO_should_read (tls->bio);
}
/**
* mongoc_stream_tls_should_write:
*
* If the stream should write
*/
bool
mongoc_stream_tls_should_write (mongoc_stream_t *stream)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (tls);
return BIO_should_write (tls->bio);
}
/**
* mongoc_stream_tls_check_cert:
*
* check the cert returned by the other party
*/
bool
mongoc_stream_tls_check_cert (mongoc_stream_t *stream,
const char *host)
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
SSL *ssl;
BSON_ASSERT (tls);
BSON_ASSERT (host);
BIO_get_ssl (tls->bio, &ssl);
return _mongoc_ssl_check_cert (ssl, host, tls->weak_cert_validation);
}
static mongoc_stream_t *
_mongoc_stream_tls_get_base_stream (mongoc_stream_t *stream)
{
return ((mongoc_stream_tls_t *)stream)->base_stream;
}
static bool
_mongoc_stream_tls_check_closed (mongoc_stream_t *stream) /* IN */
{
mongoc_stream_tls_t *tls = (mongoc_stream_tls_t *)stream;
BSON_ASSERT (stream);
return mongoc_stream_check_closed (tls->base_stream);
}
/*
*--------------------------------------------------------------------------
*
* mongoc_stream_tls_new --
*
* Creates a new mongoc_stream_tls_t to communicate with a remote
* server using a TLS stream.
*
* @base_stream should be a stream that will become owned by the
* resulting tls stream. It will be used for raw I/O.
*
* @trust_store_dir should be a path to the SSL cert db to use for
* verifying trust of the remote server.
*
* Returns:
* NULL on failure, otherwise a mongoc_stream_t.
*
* Side effects:
* None.
*
*--------------------------------------------------------------------------
*/
mongoc_stream_t *
mongoc_stream_tls_new (mongoc_stream_t *base_stream,
mongoc_ssl_opt_t *opt,
int client)
{
mongoc_stream_tls_t *tls;
SSL_CTX *ssl_ctx = NULL;
BIO *bio_ssl = NULL;
BIO *bio_mongoc_shim = NULL;
BSON_ASSERT(base_stream);
BSON_ASSERT(opt);
ssl_ctx = _mongoc_ssl_ctx_new (opt);
if (!ssl_ctx) {
return NULL;
}
+ if (opt->weak_cert_validation) {
+ SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_NONE, NULL);
+ } else {
+ SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, NULL);
+ }
+
bio_ssl = BIO_new_ssl (ssl_ctx, client);
if (!bio_ssl) {
return NULL;
}
bio_mongoc_shim = BIO_new (&gMongocStreamTlsRawMethods);
if (!bio_mongoc_shim) {
BIO_free_all (bio_ssl);
return NULL;
}
BIO_push (bio_ssl, bio_mongoc_shim);
tls = (mongoc_stream_tls_t *)bson_malloc0 (sizeof *tls);
tls->base_stream = base_stream;
tls->parent.type = MONGOC_STREAM_TLS;
tls->parent.destroy = _mongoc_stream_tls_destroy;
tls->parent.failed = _mongoc_stream_tls_failed;
tls->parent.close = _mongoc_stream_tls_close;
tls->parent.flush = _mongoc_stream_tls_flush;
tls->parent.writev = _mongoc_stream_tls_writev;
tls->parent.readv = _mongoc_stream_tls_readv;
tls->parent.setsockopt = _mongoc_stream_tls_setsockopt;
tls->parent.get_base_stream = _mongoc_stream_tls_get_base_stream;
tls->parent.check_closed = _mongoc_stream_tls_check_closed;
tls->weak_cert_validation = opt->weak_cert_validation;
tls->bio = bio_ssl;
tls->ctx = ssl_ctx;
tls->timeout_msec = -1;
bio_mongoc_shim->ptr = tls;
mongoc_counter_streams_active_inc();
return (mongoc_stream_t *)tls;
}
#endif
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-tls.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-tls.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream-tls.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream-tls.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-stream.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-stream.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-thread-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-thread-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-thread-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-thread-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-description-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-description.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-description.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-description.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-description.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-scanner.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-topology.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-topology.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-trace.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-trace.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-trace.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-trace.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-uri.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-uri.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-util-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-util-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-util-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-util-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-util.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-util.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-util.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-util.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version-functions.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version-functions.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version-functions.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version-functions.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version-functions.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version-functions.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version-functions.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version-functions.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version.h
similarity index 96%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version.h
index a2206399..3d99cffe 100644
--- a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version.h
+++ b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version.h
@@ -1,102 +1,102 @@
/*
* Copyright 2013 MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined (MONGOC_INSIDE) && !defined (MONGOC_COMPILATION)
#error "Only <mongoc.h> can be included directly."
#endif
#ifndef MONGOC_VERSION_H
#define MONGOC_VERSION_H
/**
* MONGOC_MAJOR_VERSION:
*
* MONGOC major version component (e.g. 1 if %MONGOC_VERSION is 1.2.3)
*/
#define MONGOC_MAJOR_VERSION (1)
/**
* MONGOC_MINOR_VERSION:
*
* MONGOC minor version component (e.g. 2 if %MONGOC_VERSION is 1.2.3)
*/
#define MONGOC_MINOR_VERSION (3)
/**
* MONGOC_MICRO_VERSION:
*
* MONGOC micro version component (e.g. 3 if %MONGOC_VERSION is 1.2.3)
*/
-#define MONGOC_MICRO_VERSION (3)
+#define MONGOC_MICRO_VERSION (5)
/**
* MONGOC_PRERELEASE_VERSION:
*
* MONGOC prerelease version component (e.g. rc0 if %MONGOC_VERSION is 1.2.3-rc0)
*/
#define MONGOC_PRERELEASE_VERSION ()
/**
* MONGOC_VERSION:
*
* MONGOC version.
*/
-#define MONGOC_VERSION (1.3.3)
+#define MONGOC_VERSION (1.3.5)
/**
* MONGOC_VERSION_S:
*
* MONGOC version, encoded as a string, useful for printing and
* concatenation.
*/
-#define MONGOC_VERSION_S "1.3.3"
+#define MONGOC_VERSION_S "1.3.5"
/**
* MONGOC_VERSION_HEX:
*
* MONGOC version, encoded as an hexadecimal number, useful for
* integer comparisons.
*/
#define MONGOC_VERSION_HEX (MONGOC_MAJOR_VERSION << 24 | \
MONGOC_MINOR_VERSION << 16 | \
MONGOC_MICRO_VERSION << 8)
/**
* MONGOC_CHECK_VERSION:
* @major: required major version
* @minor: required minor version
* @micro: required micro version
*
* Compile-time version checking. Evaluates to %TRUE if the version
* of MONGOC is greater than the required one.
*/
#define MONGOC_CHECK_VERSION(major,minor,micro) \
(MONGOC_MAJOR_VERSION > (major) || \
(MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION > (minor)) || \
(MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION == (minor) && \
MONGOC_MICRO_VERSION >= (micro)))
#endif /* MONGOC_VERSION_H */
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version.h.in b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version.h.in
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-version.h.in
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-version.h.in
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-command-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-command-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-command-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-command-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-command.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-command.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-command.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-command.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern-private.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern.c b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern.c
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern.c
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern.c
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc-write-concern.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc-write-concern.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/mongoc.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/mongoc.h
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-delete.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-delete.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-delete.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-delete.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-get-more.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-get-more.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-get-more.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-get-more.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-header.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-header.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-header.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-header.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-insert.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-insert.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-insert.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-insert.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-kill-cursors.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-kill-cursors.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-kill-cursors.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-kill-cursors.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-msg.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-msg.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-msg.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-msg.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-query.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-query.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-query.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-query.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-reply.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-reply.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-reply.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-reply.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/op-update.def b/mongodb-1.1.6/src/libmongoc/src/mongoc/op-update.def
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/op-update.def
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/op-update.def
diff --git a/mongodb-1.1.5/src/libmongoc/src/mongoc/utlist.h b/mongodb-1.1.6/src/libmongoc/src/mongoc/utlist.h
similarity index 100%
rename from mongodb-1.1.5/src/libmongoc/src/mongoc/utlist.h
rename to mongodb-1.1.6/src/libmongoc/src/mongoc/utlist.h
diff --git a/mongodb-1.1.5/tests/bson/bson-binary-001.phpt b/mongodb-1.1.6/tests/bson/bson-binary-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-binary-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-binary-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-binary_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-binary_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-binary_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-binary_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-binary_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-binary_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-binary_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-binary_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-binary_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-binary_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-binary_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-binary_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-binary_error-004.phpt b/mongodb-1.1.6/tests/bson/bson-binary_error-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-binary_error-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-binary_error-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-decode-001.phpt b/mongodb-1.1.6/tests/bson/bson-decode-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-decode-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-decode-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-decode-002.phpt b/mongodb-1.1.6/tests/bson/bson-decode-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-decode-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-decode-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-encode-001.phpt b/mongodb-1.1.6/tests/bson/bson-encode-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-encode-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-encode-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-encode-002.phpt b/mongodb-1.1.6/tests/bson/bson-encode-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-encode-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-encode-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-encode-003.phpt b/mongodb-1.1.6/tests/bson/bson-encode-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-encode-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-encode-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-encode-004.phpt b/mongodb-1.1.6/tests/bson/bson-encode-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-encode-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-encode-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-encode-005.phpt b/mongodb-1.1.6/tests/bson/bson-encode-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-encode-005.phpt
rename to mongodb-1.1.6/tests/bson/bson-encode-005.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromJSON-001.phpt b/mongodb-1.1.6/tests/bson/bson-fromJSON-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromJSON-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromJSON-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromJSON-002.phpt b/mongodb-1.1.6/tests/bson/bson-fromJSON-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromJSON-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromJSON-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromJSON_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-fromJSON_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromJSON_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromJSON_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP-001.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP-002.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP-003.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-fromPHP_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-fromPHP_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-fromPHP_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-fromPHP_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-generate-document-id.phpt b/mongodb-1.1.6/tests/bson/bson-generate-document-id.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-generate-document-id.phpt
rename to mongodb-1.1.6/tests/bson/bson-generate-document-id.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-javascript-001.phpt b/mongodb-1.1.6/tests/bson/bson-javascript-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-javascript-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-javascript-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-javascript-002.phpt b/mongodb-1.1.6/tests/bson/bson-javascript-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-javascript-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-javascript-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-javascript_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-javascript_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-javascript_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-javascript_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-javascript_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-javascript_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-javascript_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-javascript_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-javascript_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-javascript_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-javascript_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-javascript_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-maxkey-001.phpt b/mongodb-1.1.6/tests/bson/bson-maxkey-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-maxkey-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-maxkey-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-maxkey_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-maxkey_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-maxkey_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-maxkey_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-maxkey_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-maxkey_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-maxkey_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-maxkey_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-minkey-001.phpt b/mongodb-1.1.6/tests/bson/bson-minkey-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-minkey-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-minkey-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-minkey_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-minkey_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-minkey_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-minkey_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-minkey_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-minkey_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-minkey_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-minkey_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid-001.phpt b/mongodb-1.1.6/tests/bson/bson-objectid-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid-002.phpt b/mongodb-1.1.6/tests/bson/bson-objectid-002.phpt
similarity index 100%
copy from mongodb-1.1.5/tests/bson/bson-objectid-002.phpt
copy to mongodb-1.1.6/tests/bson/bson-objectid-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid-003.phpt b/mongodb-1.1.6/tests/bson/bson-objectid-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid-004.phpt b/mongodb-1.1.6/tests/bson/bson-objectid-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-objectid_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-objectid_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-objectid_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-objectid_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-objectid_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-ods-001.phpt b/mongodb-1.1.6/tests/bson/bson-ods-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-ods-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-ods-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-ods-002.phpt b/mongodb-1.1.6/tests/bson/bson-ods-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-ods-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-ods-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-regex-001.phpt b/mongodb-1.1.6/tests/bson/bson-regex-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-regex-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-regex-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-regex-002.phpt b/mongodb-1.1.6/tests/bson/bson-regex-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-regex-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-regex-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-regex_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-regex_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-regex_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-regex_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-regex_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-regex_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-regex_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-regex_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-regex_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-regex_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-regex_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-regex_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp-001.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp-002.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp-003.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp-004.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp_error-004.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp_error-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp_error-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp_error-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-timestamp_error-005.phpt b/mongodb-1.1.6/tests/bson/bson-timestamp_error-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-timestamp_error-005.phpt
rename to mongodb-1.1.6/tests/bson/bson-timestamp_error-005.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toJSON-001.phpt b/mongodb-1.1.6/tests/bson/bson-toJSON-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toJSON-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-toJSON-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toJSON-002.phpt b/mongodb-1.1.6/tests/bson/bson-toJSON-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toJSON-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-toJSON-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toJSON_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-toJSON_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toJSON_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-toJSON_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toJSON_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-toJSON_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toJSON_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-toJSON_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toJSON_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-toJSON_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toJSON_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-toJSON_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP-001.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP-002.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP-003.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-toPHP_error-004.phpt b/mongodb-1.1.6/tests/bson/bson-toPHP_error-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-toPHP_error-004.phpt
rename to mongodb-1.1.6/tests/bson/bson-toPHP_error-004.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-unknown-001.phpt b/mongodb-1.1.6/tests/bson/bson-unknown-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-unknown-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-unknown-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-001.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-002.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-003.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-int-size.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-int-size.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-int-size.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-int-size.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-todatetime-001.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-todatetime-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-todatetime-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-todatetime-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime-tostring-001.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime-tostring-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime-tostring-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime-tostring-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime_error-001.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime_error-001.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime_error-002.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime_error-002.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime_error-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-utcdatetime_error-003.phpt b/mongodb-1.1.6/tests/bson/bson-utcdatetime_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bson-utcdatetime_error-003.phpt
rename to mongodb-1.1.6/tests/bson/bson-utcdatetime_error-003.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0274.phpt b/mongodb-1.1.6/tests/bson/bug0274.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0274.phpt
rename to mongodb-1.1.6/tests/bson/bug0274.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0325.phpt b/mongodb-1.1.6/tests/bson/bug0325.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0325.phpt
rename to mongodb-1.1.6/tests/bson/bug0325.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0334-001.phpt b/mongodb-1.1.6/tests/bson/bug0334-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0334-001.phpt
rename to mongodb-1.1.6/tests/bson/bug0334-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0334-002.phpt b/mongodb-1.1.6/tests/bson/bug0334-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0334-002.phpt
rename to mongodb-1.1.6/tests/bson/bug0334-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0341.phpt b/mongodb-1.1.6/tests/bson/bug0341.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0341.phpt
rename to mongodb-1.1.6/tests/bson/bug0341.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0347.phpt b/mongodb-1.1.6/tests/bson/bug0347.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0347.phpt
rename to mongodb-1.1.6/tests/bson/bug0347.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0528.phpt b/mongodb-1.1.6/tests/bson/bug0528.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0528.phpt
rename to mongodb-1.1.6/tests/bson/bug0528.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0531.phpt b/mongodb-1.1.6/tests/bson/bug0531.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0531.phpt
rename to mongodb-1.1.6/tests/bson/bug0531.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0544.phpt b/mongodb-1.1.6/tests/bson/bug0544.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0544.phpt
rename to mongodb-1.1.6/tests/bson/bug0544.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0592.phpt b/mongodb-1.1.6/tests/bson/bug0592.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0592.phpt
rename to mongodb-1.1.6/tests/bson/bug0592.phpt
diff --git a/mongodb-1.1.5/tests/bson/bug0623.phpt b/mongodb-1.1.6/tests/bson/bug0623.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/bug0623.phpt
rename to mongodb-1.1.6/tests/bson/bug0623.phpt
diff --git a/mongodb-1.1.5/tests/bson/typemap-001.phpt b/mongodb-1.1.6/tests/bson/typemap-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/typemap-001.phpt
rename to mongodb-1.1.6/tests/bson/typemap-001.phpt
diff --git a/mongodb-1.1.5/tests/bson/typemap-002.phpt b/mongodb-1.1.6/tests/bson/typemap-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bson/typemap-002.phpt
rename to mongodb-1.1.6/tests/bson/typemap-002.phpt
diff --git a/mongodb-1.1.5/tests/bson/bson-objectid-002.phpt b/mongodb-1.1.6/tests/bulk/bug0667.phpt
similarity index 50%
rename from mongodb-1.1.5/tests/bson/bson-objectid-002.phpt
rename to mongodb-1.1.6/tests/bulk/bug0667.phpt
index f0cd221b..207e6a48 100644
--- a/mongodb-1.1.5/tests/bson/bson-objectid-002.phpt
+++ b/mongodb-1.1.6/tests/bulk/bug0667.phpt
@@ -1,26 +1,25 @@
--TEST--
-BSON BSON\ObjectID #002 generates ObjectID for null or missing constructor argument
+PHPC-667: BulkWrite::insert() does not generate ObjectID if another field has "_id" prefix
--SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
-$classname = BSON_NAMESPACE . "\\ObjectID";
-
-var_dump(new $classname());
-var_dump(new $classname(null));
+$bulk = new MongoDB\Driver\BulkWrite;
+var_dump($bulk->insert(['_ids' => 1]));
+var_dump($bulk->insert((object) ['_ids' => 1]));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
object(MongoDB\BSON\ObjectID)#%d (%d) {
["oid"]=>
string(24) "%x"
}
object(MongoDB\BSON\ObjectID)#%d (%d) {
["oid"]=>
string(24) "%x"
}
===DONE===
diff --git a/mongodb-1.1.5/tests/bulk/bulkwrite-delete-001.phpt b/mongodb-1.1.6/tests/bulk/bulkwrite-delete-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/bulkwrite-delete-001.phpt
rename to mongodb-1.1.6/tests/bulk/bulkwrite-delete-001.phpt
diff --git a/mongodb-1.1.5/tests/bulk/bulkwrite-insert-001.phpt b/mongodb-1.1.6/tests/bulk/bulkwrite-insert-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/bulkwrite-insert-001.phpt
rename to mongodb-1.1.6/tests/bulk/bulkwrite-insert-001.phpt
diff --git a/mongodb-1.1.5/tests/bulk/bulkwrite-update-001.phpt b/mongodb-1.1.6/tests/bulk/bulkwrite-update-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/bulkwrite-update-001.phpt
rename to mongodb-1.1.6/tests/bulk/bulkwrite-update-001.phpt
diff --git a/mongodb-1.1.5/tests/bulk/bulkwrite_error-001.phpt b/mongodb-1.1.6/tests/bulk/bulkwrite_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/bulkwrite_error-001.phpt
rename to mongodb-1.1.6/tests/bulk/bulkwrite_error-001.phpt
diff --git a/mongodb-1.1.5/tests/bulk/write-0001.phpt b/mongodb-1.1.6/tests/bulk/write-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/write-0001.phpt
rename to mongodb-1.1.6/tests/bulk/write-0001.phpt
diff --git a/mongodb-1.1.5/tests/bulk/write-0002.phpt b/mongodb-1.1.6/tests/bulk/write-0002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/write-0002.phpt
rename to mongodb-1.1.6/tests/bulk/write-0002.phpt
diff --git a/mongodb-1.1.5/tests/bulk/write-0003.phpt b/mongodb-1.1.6/tests/bulk/write-0003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/bulk/write-0003.phpt
rename to mongodb-1.1.6/tests/bulk/write-0003.phpt
diff --git a/mongodb-1.1.5/tests/connect/replicaset-seedlist-001.phpt b/mongodb-1.1.6/tests/connect/replicaset-seedlist-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/replicaset-seedlist-001.phpt
rename to mongodb-1.1.6/tests/connect/replicaset-seedlist-001.phpt
diff --git a/mongodb-1.1.5/tests/connect/replicaset-seedlist-002.phpt b/mongodb-1.1.6/tests/connect/replicaset-seedlist-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/replicaset-seedlist-002.phpt
rename to mongodb-1.1.6/tests/connect/replicaset-seedlist-002.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-auth-0001.phpt b/mongodb-1.1.6/tests/connect/standalone-auth-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-auth-0001.phpt
rename to mongodb-1.1.6/tests/connect/standalone-auth-0001.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-auth-0002.phpt b/mongodb-1.1.6/tests/connect/standalone-auth-0002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-auth-0002.phpt
rename to mongodb-1.1.6/tests/connect/standalone-auth-0002.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-plain-0001.phpt b/mongodb-1.1.6/tests/connect/standalone-plain-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-plain-0001.phpt
rename to mongodb-1.1.6/tests/connect/standalone-plain-0001.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-plain-0002.phpt b/mongodb-1.1.6/tests/connect/standalone-plain-0002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-plain-0002.phpt
rename to mongodb-1.1.6/tests/connect/standalone-plain-0002.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0001.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0001.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0001.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0002.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0002.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0002.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0003.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0003.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0003.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0004.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0004.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0004.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0005.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0005.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0005.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-ssl-0006.phpt b/mongodb-1.1.6/tests/connect/standalone-ssl-0006.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-ssl-0006.phpt
rename to mongodb-1.1.6/tests/connect/standalone-ssl-0006.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-x509-0001.phpt b/mongodb-1.1.6/tests/connect/standalone-x509-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-x509-0001.phpt
rename to mongodb-1.1.6/tests/connect/standalone-x509-0001.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-x509-0002.phpt b/mongodb-1.1.6/tests/connect/standalone-x509-0002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-x509-0002.phpt
rename to mongodb-1.1.6/tests/connect/standalone-x509-0002.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-x509-0003.phpt b/mongodb-1.1.6/tests/connect/standalone-x509-0003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-x509-0003.phpt
rename to mongodb-1.1.6/tests/connect/standalone-x509-0003.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-x509-0004.phpt b/mongodb-1.1.6/tests/connect/standalone-x509-0004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-x509-0004.phpt
rename to mongodb-1.1.6/tests/connect/standalone-x509-0004.phpt
diff --git a/mongodb-1.1.5/tests/connect/standalone-x509-error-0001.phpt b/mongodb-1.1.6/tests/connect/standalone-x509-error-0001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/connect/standalone-x509-error-0001.phpt
rename to mongodb-1.1.6/tests/connect/standalone-x509-error-0001.phpt
diff --git a/mongodb-1.1.5/tests/functional/cursor-001.phpt b/mongodb-1.1.6/tests/functional/cursor-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/cursor-001.phpt
rename to mongodb-1.1.6/tests/functional/cursor-001.phpt
diff --git a/mongodb-1.1.5/tests/functional/cursorid-001.phpt b/mongodb-1.1.6/tests/functional/cursorid-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/cursorid-001.phpt
rename to mongodb-1.1.6/tests/functional/cursorid-001.phpt
diff --git a/mongodb-1.1.5/tests/functional/phpinfo-1.phpt b/mongodb-1.1.6/tests/functional/phpinfo-1.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/phpinfo-1.phpt
rename to mongodb-1.1.6/tests/functional/phpinfo-1.phpt
diff --git a/mongodb-1.1.5/tests/functional/phpinfo-2.phpt b/mongodb-1.1.6/tests/functional/phpinfo-2.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/phpinfo-2.phpt
rename to mongodb-1.1.6/tests/functional/phpinfo-2.phpt
diff --git a/mongodb-1.1.5/tests/functional/query-sort-001.phpt b/mongodb-1.1.6/tests/functional/query-sort-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/query-sort-001.phpt
rename to mongodb-1.1.6/tests/functional/query-sort-001.phpt
diff --git a/mongodb-1.1.5/tests/functional/query-sort-002.phpt b/mongodb-1.1.6/tests/functional/query-sort-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/query-sort-002.phpt
rename to mongodb-1.1.6/tests/functional/query-sort-002.phpt
diff --git a/mongodb-1.1.5/tests/functional/query-sort-003.phpt b/mongodb-1.1.6/tests/functional/query-sort-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/query-sort-003.phpt
rename to mongodb-1.1.6/tests/functional/query-sort-003.phpt
diff --git a/mongodb-1.1.5/tests/functional/query-sort-004.phpt b/mongodb-1.1.6/tests/functional/query-sort-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/functional/query-sort-004.phpt
rename to mongodb-1.1.6/tests/functional/query-sort-004.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor-001.phpt b/mongodb-1.1.6/tests/manager/manager-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor-002.phpt b/mongodb-1.1.6/tests/manager/manager-ctor-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor_error-001.phpt b/mongodb-1.1.6/tests/manager/manager-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor_error-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor_error-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor_error-002.phpt b/mongodb-1.1.6/tests/manager/manager-ctor_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor_error-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor_error-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor_error-003.phpt b/mongodb-1.1.6/tests/manager/manager-ctor_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor_error-003.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor_error-003.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-ctor_error-004.phpt b/mongodb-1.1.6/tests/manager/manager-ctor_error-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-ctor_error-004.phpt
rename to mongodb-1.1.6/tests/manager/manager-ctor_error-004.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-debug-001.phpt b/mongodb-1.1.6/tests/manager/manager-debug-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-debug-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-debug-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-debug-002.phpt b/mongodb-1.1.6/tests/manager/manager-debug-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-debug-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-debug-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-debug-003.phpt b/mongodb-1.1.6/tests/manager/manager-debug-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-debug-003.phpt
rename to mongodb-1.1.6/tests/manager/manager-debug-003.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-destruct-001.phpt b/mongodb-1.1.6/tests/manager/manager-destruct-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-destruct-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-destruct-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-002.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-003.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-003.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-003.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-004.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-004.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-004.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-005.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-005.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-005.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-006.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-006.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-006.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-006.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-007.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-007.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-007.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-007.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-008.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-008.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-008.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-008.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-009.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-009.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-009.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-009.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-010.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-010.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-010.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-010.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-011.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-011.phpt
similarity index 95%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite-011.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite-011.phpt
index 6d695e4c..0cd46b7a 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite-011.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite-011.phpt
@@ -1,82 +1,82 @@
--TEST--
MongoDB\Driver\BulkWrite: bypassDocumentValidation option
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(STANDALONE);
$command = new MongoDB\Driver\Command([
'create' => COLLECTION_NAME,
'validator' => ['x' => ['$type' => 'number']],
]);
$manager->executeCommand(DATABASE_NAME, $command);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(['_id' => 1, 'x' => 1]);
$bulk->insert(['_id' => 2, 'x' => 2]);
$manager->executeBulkWrite(NS, $bulk);
$bulk = new MongoDB\Driver\BulkWrite(['bypassDocumentValidation' => true]);
$bulk->update(['_id' => 2], ['$set' => ['x' => 'two']]);
$manager->executeBulkWrite(NS, $bulk);
$bulk = new MongoDB\Driver\BulkWrite(['bypassDocumentValidation' => true]);
$bulk->insert(['_id' => 3, 'x' => 'three']);
$manager->executeBulkWrite(NS, $bulk);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(['_id' => 4, 'x' => 'four']);
echo throws(function() use($manager, $bulk) {
$manager->executeBulkWrite(NS, $bulk);
}, "MongoDB\Driver\Exception\BulkWriteException"), "\n";
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->update(['_id' => 1], ['$set' => ['x' => 'one']]);
echo throws(function() use($manager, $bulk) {
$manager->executeBulkWrite(NS, $bulk);
}, "MongoDB\Driver\Exception\BulkWriteException"), "\n";
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->update(['_id' => 2], ['$set' => ['x' => 2]]);
$manager->executeBulkWrite(NS, $bulk);
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([]));
var_dump(iterator_to_array($cursor));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\BulkWriteException
-BulkWrite error :: Document failed validation
+Document failed validation
OK: Got MongoDB\Driver\Exception\BulkWriteException
-BulkWrite error :: Document failed validation
+Document failed validation
array(3) {
[0]=>
object(stdClass)#%d (2) {
["_id"]=>
int(1)
["x"]=>
int(1)
}
[1]=>
object(stdClass)#%d (2) {
["_id"]=>
int(2)
["x"]=>
int(2)
}
[2]=>
object(stdClass)#%d (2) {
["_id"]=>
int(3)
["x"]=>
string(5) "three"
}
}
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-001.phpt
similarity index 90%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-001.phpt
index dafea24f..dbaa8f56 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-001.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-001.phpt
@@ -1,65 +1,65 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() with duplicate key errors (ordered)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(STANDALONE);
$bulk = new MongoDB\Driver\BulkWrite(['ordered' => true]);
$bulk->insert(array('_id' => 1));
$bulk->insert(array('_id' => 1));
$bulk->insert(array('_id' => 2));
$bulk->insert(array('_id' => 2));
try {
$result = $manager->executeBulkWrite(NS, $bulk);
echo "FAILED\n";
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
echo "\n===> Collection\n";
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()));
var_dump(iterator_to_array($cursor));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_001%sdup key: { : 1 }
+BulkWriteException: E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_001%sdup key: { : 1 }
===> WriteResult
server: %s:%d
insertedCount: 1
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(%d) "%s"
["code"]=>
int(11000)
["index"]=>
int(1)
["info"]=>
NULL
}
writeError[1].message: %s
writeError[1].code: 11000
===> Collection
array(1) {
[0]=>
object(stdClass)#%d (1) {
["_id"]=>
int(1)
}
}
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-002.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-002.phpt
similarity index 86%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-002.phpt
index 3c7decc8..a4e0f3e8 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-002.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-002.phpt
@@ -1,82 +1,82 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() with duplicate key errors (unordered)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(STANDALONE);
$bulk = new MongoDB\Driver\BulkWrite(['ordered' => false]);
$bulk->insert(array('_id' => 1));
$bulk->insert(array('_id' => 1));
$bulk->insert(array('_id' => 2));
$bulk->insert(array('_id' => 2));
try {
$result = $manager->executeBulkWrite(NS, $bulk);
echo "FAILED\n";
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
echo "\n===> Collection\n";
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()));
var_dump(iterator_to_array($cursor));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_002%sdup key: { : 1 } :: E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_002%sdup key: { : 2 }
+BulkWriteException: Multiple write errors: "E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_002%sdup key: { : 1 }", "E11000 duplicate key error %s: phongo.manager_manager_executeBulkWrite_error_002%sdup key: { : 2 }"
===> WriteResult
server: %s:%d
insertedCount: 2
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(%d) "%s"
["code"]=>
int(11000)
["index"]=>
int(1)
["info"]=>
NULL
}
writeError[1].message: %s
writeError[1].code: 11000
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(%d) "%s"
["code"]=>
int(11000)
["index"]=>
int(3)
["info"]=>
NULL
}
writeError[3].message: %s
writeError[3].code: 11000
===> Collection
array(2) {
[0]=>
object(stdClass)#%d (1) {
["_id"]=>
int(1)
}
[1]=>
object(stdClass)#%d (1) {
["_id"]=>
int(2)
}
}
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-003.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-003.phpt
similarity index 95%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-003.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-003.phpt
index 1b528761..6ed33097 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-003.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-003.phpt
@@ -1,63 +1,63 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() write concern error
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS("REPLICASET"); CLEANUP(REPLICASET); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(REPLICASET);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(array('_id' => 1, 'x' => 1));
try {
$manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(30));
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
echo "\n===> Collection\n";
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()));
var_dump(iterator_to_array($cursor));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: Not enough data-bearing nodes
+BulkWriteException: Not enough data-bearing nodes
===> WriteResult
server: %s:%d
insertedCount: 1
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteConcernError)#%d (%d) {
["message"]=>
string(29) "Not enough data-bearing nodes"
["code"]=>
int(100)
["info"]=>
NULL
}
writeConcernError.message: Not enough data-bearing nodes
writeConcernError.code: 100
writeConcernError.info: NULL
===> Collection
array(1) {
[0]=>
object(stdClass)#%d (%d) {
["_id"]=>
int(1)
["x"]=>
int(1)
}
}
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-004.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-004.phpt
similarity index 95%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-004.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-004.phpt
index 7bbf6425..c02b84bb 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-004.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-004.phpt
@@ -1,68 +1,68 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() delete write error
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS("REPLICASET"); CLEANUP(REPLICASET); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(REPLICASET);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(array('_id' => 1, 'x' => 1));
$manager->executeBulkWrite(NS, $bulk);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->delete(['$foo' => 1], ['limit' => 1]);
try {
$manager->executeBulkWrite(NS, $bulk);
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
echo "\n===> Collection\n";
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()));
var_dump(iterator_to_array($cursor));
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: unknown top level operator: $foo
+BulkWriteException: unknown top level operator: $foo
===> WriteResult
server: %s:%d
insertedCount: 0
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(32) "unknown top level operator: $foo"
["code"]=>
int(2)
["index"]=>
int(0)
["info"]=>
NULL
}
writeError[0].message: unknown top level operator: $foo
writeError[0].code: 2
===> Collection
array(1) {
[0]=>
object(stdClass)#%d (%d) {
["_id"]=>
int(1)
["x"]=>
int(1)
}
}
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-005.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-005.phpt
similarity index 92%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-005.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-005.phpt
index acfb8d9b..81c965aa 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-005.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-005.phpt
@@ -1,48 +1,48 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() insert write error
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(STANDALONE);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(['$foo' => 1]);
try {
$manager->executeBulkWrite(NS, $bulk);
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: Document can't have $ prefixed field names: $foo
+BulkWriteException: Document can't have $ prefixed field names: $foo
===> WriteResult
server: %s:%d
insertedCount: 0
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(48) "Document can't have $ prefixed field names: $foo"
["code"]=>
int(2)
["index"]=>
int(0)
["info"]=>
NULL
}
writeError[0].message: Document can't have $ prefixed field names: $foo
writeError[0].code: 2
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-006.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-006.phpt
similarity index 94%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-006.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-006.phpt
index c8b06835..579901e7 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-006.phpt
+++ b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-006.phpt
@@ -1,52 +1,52 @@
--TEST--
MongoDB\Driver\Manager::executeBulkWrite() update write error
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$manager = new MongoDB\Driver\Manager(STANDALONE);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(array('x' => 1));
$manager->executeBulkWrite(NS, $bulk);
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->update(['x' => 1], ['$foo' => 1]);
try {
$manager->executeBulkWrite(NS, $bulk);
} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
printf("BulkWriteException: %s\n", $e->getMessage());
echo "\n===> WriteResult\n";
printWriteResult($e->getWriteResult());
}
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
-BulkWriteException: BulkWrite error :: Unknown modifier: $foo
+BulkWriteException: Unknown modifier: $foo
===> WriteResult
server: %s:%d
insertedCount: 0
matchedCount: 0
modifiedCount: 0
upsertedCount: 0
deletedCount: 0
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(22) "Unknown modifier: $foo"
["code"]=>
int(9)
["index"]=>
int(0)
["info"]=>
NULL
}
writeError[0].message: Unknown modifier: $foo
writeError[0].code: 9
===DONE===
diff --git a/mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-007.phpt b/mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-007.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeBulkWrite_error-007.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeBulkWrite_error-007.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeCommand-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeCommand-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeCommand-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeCommand-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeCommand_error-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeCommand_error-001.phpt
similarity index 100%
copy from mongodb-1.1.5/tests/manager/manager-executeCommand_error-001.phpt
copy to mongodb-1.1.6/tests/manager/manager-executeCommand_error-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeQuery-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeQuery-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeQuery-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeQuery-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeQuery-002.phpt b/mongodb-1.1.6/tests/manager/manager-executeQuery-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeQuery-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeQuery-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeQuery-005.phpt b/mongodb-1.1.6/tests/manager/manager-executeQuery-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeQuery-005.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeQuery-005.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeQuery_error-001.phpt b/mongodb-1.1.6/tests/manager/manager-executeQuery_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executeQuery_error-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-executeQuery_error-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executequery-without-assignment.phpt b/mongodb-1.1.6/tests/manager/manager-executequery-without-assignment.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-executequery-without-assignment.phpt
rename to mongodb-1.1.6/tests/manager/manager-executequery-without-assignment.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-getreadconcern-001.phpt b/mongodb-1.1.6/tests/manager/manager-getreadconcern-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-getreadconcern-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-getreadconcern-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-getreadpreference-001.phpt b/mongodb-1.1.6/tests/manager/manager-getreadpreference-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-getreadpreference-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-getreadpreference-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-getservers-001.phpt b/mongodb-1.1.6/tests/manager/manager-getservers-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-getservers-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-getservers-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-getservers-002.phpt b/mongodb-1.1.6/tests/manager/manager-getservers-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-getservers-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-getservers-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-getwriteconcern-001.phpt b/mongodb-1.1.6/tests/manager/manager-getwriteconcern-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-getwriteconcern-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-getwriteconcern-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-invalidnamespace.phpt b/mongodb-1.1.6/tests/manager/manager-invalidnamespace.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-invalidnamespace.phpt
rename to mongodb-1.1.6/tests/manager/manager-invalidnamespace.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-selectserver-001.phpt b/mongodb-1.1.6/tests/manager/manager-selectserver-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-selectserver-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-selectserver-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-selectserver_error-001.phpt b/mongodb-1.1.6/tests/manager/manager-selectserver_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-selectserver_error-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-selectserver_error-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-set-uri-options-001.phpt b/mongodb-1.1.6/tests/manager/manager-set-uri-options-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-set-uri-options-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-set-uri-options-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-set-uri-options-002.phpt b/mongodb-1.1.6/tests/manager/manager-set-uri-options-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-set-uri-options-002.phpt
rename to mongodb-1.1.6/tests/manager/manager-set-uri-options-002.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-var-dump-001.phpt b/mongodb-1.1.6/tests/manager/manager-var-dump-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-var-dump-001.phpt
rename to mongodb-1.1.6/tests/manager/manager-var-dump-001.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-wakeup.phpt b/mongodb-1.1.6/tests/manager/manager-wakeup.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager-wakeup.phpt
rename to mongodb-1.1.6/tests/manager/manager-wakeup.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager_error-001.phpt b/mongodb-1.1.6/tests/manager/manager_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/manager/manager_error-001.phpt
rename to mongodb-1.1.6/tests/manager/manager_error-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/bug0146-001.phpt b/mongodb-1.1.6/tests/readPreference/bug0146-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/bug0146-001.phpt
rename to mongodb-1.1.6/tests/readPreference/bug0146-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/bug0146-002.phpt b/mongodb-1.1.6/tests/readPreference/bug0146-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/bug0146-002.phpt
rename to mongodb-1.1.6/tests/readPreference/bug0146-002.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/readpreference-ctor-001.phpt b/mongodb-1.1.6/tests/readPreference/readpreference-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/readpreference-ctor-001.phpt
rename to mongodb-1.1.6/tests/readPreference/readpreference-ctor-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/readpreference-ctor_error-001.phpt b/mongodb-1.1.6/tests/readPreference/readpreference-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/readpreference-ctor_error-001.phpt
rename to mongodb-1.1.6/tests/readPreference/readpreference-ctor_error-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/readpreference-getMode-001.phpt b/mongodb-1.1.6/tests/readPreference/readpreference-getMode-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/readpreference-getMode-001.phpt
rename to mongodb-1.1.6/tests/readPreference/readpreference-getMode-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/readpreference-getTagSets-001.phpt b/mongodb-1.1.6/tests/readPreference/readpreference-getTagSets-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/readpreference-getTagSets-001.phpt
rename to mongodb-1.1.6/tests/readPreference/readpreference-getTagSets-001.phpt
diff --git a/mongodb-1.1.5/tests/readPreference/readpreference_error-001.phpt b/mongodb-1.1.6/tests/readPreference/readpreference_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/readPreference/readpreference_error-001.phpt
rename to mongodb-1.1.6/tests/readPreference/readpreference_error-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-constants.phpt b/mongodb-1.1.6/tests/server/server-constants.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-constants.phpt
rename to mongodb-1.1.6/tests/server/server-constants.phpt
diff --git a/mongodb-1.1.5/tests/server/server-construct-001.phpt b/mongodb-1.1.6/tests/server/server-construct-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-construct-001.phpt
rename to mongodb-1.1.6/tests/server/server-construct-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-debug.phpt b/mongodb-1.1.6/tests/server/server-debug.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-debug.phpt
rename to mongodb-1.1.6/tests/server/server-debug.phpt
diff --git a/mongodb-1.1.5/tests/server/server-errors.phpt b/mongodb-1.1.6/tests/server/server-errors.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-errors.phpt
rename to mongodb-1.1.6/tests/server/server-errors.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeBulkWrite-001.phpt b/mongodb-1.1.6/tests/server/server-executeBulkWrite-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeBulkWrite-001.phpt
rename to mongodb-1.1.6/tests/server/server-executeBulkWrite-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeBulkWrite-002.phpt b/mongodb-1.1.6/tests/server/server-executeBulkWrite-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeBulkWrite-002.phpt
rename to mongodb-1.1.6/tests/server/server-executeBulkWrite-002.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeBulkWrite-003.phpt b/mongodb-1.1.6/tests/server/server-executeBulkWrite-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeBulkWrite-003.phpt
rename to mongodb-1.1.6/tests/server/server-executeBulkWrite-003.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeBulkWrite-004.phpt b/mongodb-1.1.6/tests/server/server-executeBulkWrite-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeBulkWrite-004.phpt
rename to mongodb-1.1.6/tests/server/server-executeBulkWrite-004.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeBulkWrite-005.phpt b/mongodb-1.1.6/tests/server/server-executeBulkWrite-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeBulkWrite-005.phpt
rename to mongodb-1.1.6/tests/server/server-executeBulkWrite-005.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeCommand-001.phpt b/mongodb-1.1.6/tests/server/server-executeCommand-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeCommand-001.phpt
rename to mongodb-1.1.6/tests/server/server-executeCommand-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeCommand-002.phpt b/mongodb-1.1.6/tests/server/server-executeCommand-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeCommand-002.phpt
rename to mongodb-1.1.6/tests/server/server-executeCommand-002.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeCommand_error-001.phpt b/mongodb-1.1.6/tests/server/server-executeCommand_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeCommand_error-001.phpt
rename to mongodb-1.1.6/tests/server/server-executeCommand_error-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-001.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-001.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-002.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-002.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-002.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-003.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-003.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-003.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-004.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-004.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-004.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-005.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-005.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-005.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-006.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-006.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-006.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-006.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery-007.phpt b/mongodb-1.1.6/tests/server/server-executeQuery-007.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery-007.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery-007.phpt
diff --git a/mongodb-1.1.5/tests/server/server-executeQuery_error-001.phpt b/mongodb-1.1.6/tests/server/server-executeQuery_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server-executeQuery_error-001.phpt
rename to mongodb-1.1.6/tests/server/server-executeQuery_error-001.phpt
diff --git a/mongodb-1.1.5/tests/server/server_error-001.phpt b/mongodb-1.1.6/tests/server/server_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/server/server_error-001.phpt
rename to mongodb-1.1.6/tests/server/server_error-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0159.phpt b/mongodb-1.1.6/tests/standalone/bug0159.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0159.phpt
rename to mongodb-1.1.6/tests/standalone/bug0159.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0166.phpt b/mongodb-1.1.6/tests/standalone/bug0166.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0166.phpt
rename to mongodb-1.1.6/tests/standalone/bug0166.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0231.phpt b/mongodb-1.1.6/tests/standalone/bug0231.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0231.phpt
rename to mongodb-1.1.6/tests/standalone/bug0231.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0357.phpt b/mongodb-1.1.6/tests/standalone/bug0357.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0357.phpt
rename to mongodb-1.1.6/tests/standalone/bug0357.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0487-001.phpt b/mongodb-1.1.6/tests/standalone/bug0487-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0487-001.phpt
rename to mongodb-1.1.6/tests/standalone/bug0487-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0487-002.phpt b/mongodb-1.1.6/tests/standalone/bug0487-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0487-002.phpt
rename to mongodb-1.1.6/tests/standalone/bug0487-002.phpt
diff --git a/mongodb-1.1.5/tests/standalone/bug0545.phpt b/mongodb-1.1.6/tests/standalone/bug0545.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/bug0545.phpt
rename to mongodb-1.1.6/tests/standalone/bug0545.phpt
diff --git a/mongodb-1.1.5/tests/manager/manager-executeCommand_error-001.phpt b/mongodb-1.1.6/tests/standalone/bug0655.phpt
similarity index 62%
rename from mongodb-1.1.5/tests/manager/manager-executeCommand_error-001.phpt
rename to mongodb-1.1.6/tests/standalone/bug0655.phpt
index 74ba9a00..9cd085fe 100644
--- a/mongodb-1.1.5/tests/manager/manager-executeCommand_error-001.phpt
+++ b/mongodb-1.1.6/tests/standalone/bug0655.phpt
@@ -1,33 +1,46 @@
--TEST--
-MongoDB\Driver\Manager::executeCommand() should not issue warning before exception
+PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
--SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not use custom streams"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
$command = new MongoDB\Driver\Command(['ping' => 1]);
// Invalid host cannot be resolved
-$manager = new MongoDB\Driver\Manager('mongodb://invalid.host:27017', ['serverSelectionTimeoutMS' => 1]);
+$manager = new MongoDB\Driver\Manager('mongodb://invalid.host:27017', ['connectTimeoutMS' => 1]);
+
+ini_set('mongodb.debug', 'stderr');
echo throws(function() use ($manager, $command) {
$manager->executeCommand(DATABASE_NAME, $command);
}, 'MongoDB\Driver\Exception\ConnectionTimeoutException'), "\n";
// Valid host refuses connection
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:54321', ['serverSelectionTimeoutMS' => 1]);
+$manager = new MongoDB\Driver\Manager('mongodb://localhost:54321', ['CONNECTTIMEOUTMS' => 1]);
echo throws(function() use ($manager, $command) {
$manager->executeCommand(DATABASE_NAME, $command);
}, 'MongoDB\Driver\Exception\ConnectionTimeoutException'), "\n";
+ini_set('mongodb.debug', 'off');
+
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
+%a
+[%s] PHONGO: DEBUG > Applying connectTimeoutMS: 1
+[%s] PHONGO: DEBUG > Connecting to 'invalid.host:27017[mongodb://invalid.host:27017]'
+%a
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
No suitable servers found (`serverselectiontryonce` set): %s
+%a
+[%s] PHONGO: DEBUG > Applying connectTimeoutMS: 1
+[%s] PHONGO: DEBUG > Connecting to 'localhost:54321[mongodb://localhost:54321]'
+%a
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
No suitable servers found (`serverselectiontryonce` set): %s
===DONE===
diff --git a/mongodb-1.1.5/tests/standalone/connectiontimeoutexception-001.phpt b/mongodb-1.1.6/tests/standalone/connectiontimeoutexception-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/connectiontimeoutexception-001.phpt
rename to mongodb-1.1.6/tests/standalone/connectiontimeoutexception-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/executiontimeoutexception-001.phpt b/mongodb-1.1.6/tests/standalone/executiontimeoutexception-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/executiontimeoutexception-001.phpt
rename to mongodb-1.1.6/tests/standalone/executiontimeoutexception-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/executiontimeoutexception-002.phpt b/mongodb-1.1.6/tests/standalone/executiontimeoutexception-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/executiontimeoutexception-002.phpt
rename to mongodb-1.1.6/tests/standalone/executiontimeoutexception-002.phpt
diff --git a/mongodb-1.1.5/tests/standalone/manager-as-singleton.phpt b/mongodb-1.1.6/tests/standalone/manager-as-singleton.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/manager-as-singleton.phpt
rename to mongodb-1.1.6/tests/standalone/manager-as-singleton.phpt
diff --git a/mongodb-1.1.5/tests/standalone/query-errors.phpt b/mongodb-1.1.6/tests/standalone/query-errors.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/query-errors.phpt
rename to mongodb-1.1.6/tests/standalone/query-errors.phpt
diff --git a/mongodb-1.1.5/tests/standalone/update-multi-001.phpt b/mongodb-1.1.6/tests/standalone/update-multi-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/update-multi-001.phpt
rename to mongodb-1.1.6/tests/standalone/update-multi-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/write-error-001.phpt b/mongodb-1.1.6/tests/standalone/write-error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/write-error-001.phpt
rename to mongodb-1.1.6/tests/standalone/write-error-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-001.phpt b/mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-001.phpt
rename to mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-001.phpt
diff --git a/mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-002.phpt b/mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-002.phpt
rename to mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-002.phpt
diff --git a/mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-003.phpt b/mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/standalone/writeresult-isacknowledged-003.phpt
rename to mongodb-1.1.6/tests/standalone/writeresult-isacknowledged-003.phpt
diff --git a/mongodb-1.1.5/tests/utils/PHONGO-FIXTURES.json.gz b/mongodb-1.1.6/tests/utils/PHONGO-FIXTURES.json.gz
similarity index 100%
rename from mongodb-1.1.5/tests/utils/PHONGO-FIXTURES.json.gz
rename to mongodb-1.1.6/tests/utils/PHONGO-FIXTURES.json.gz
diff --git a/mongodb-1.1.5/tests/utils/basic-skipif.inc b/mongodb-1.1.6/tests/utils/basic-skipif.inc
similarity index 100%
rename from mongodb-1.1.5/tests/utils/basic-skipif.inc
rename to mongodb-1.1.6/tests/utils/basic-skipif.inc
diff --git a/mongodb-1.1.5/tests/utils/basic.inc b/mongodb-1.1.6/tests/utils/basic.inc
similarity index 100%
rename from mongodb-1.1.5/tests/utils/basic.inc
rename to mongodb-1.1.6/tests/utils/basic.inc
diff --git a/mongodb-1.1.5/tests/utils/classes.inc b/mongodb-1.1.6/tests/utils/classes.inc
similarity index 100%
rename from mongodb-1.1.5/tests/utils/classes.inc
rename to mongodb-1.1.6/tests/utils/classes.inc
diff --git a/mongodb-1.1.5/tests/utils/tools.php b/mongodb-1.1.6/tests/utils/tools.php
similarity index 100%
rename from mongodb-1.1.5/tests/utils/tools.php
rename to mongodb-1.1.6/tests/utils/tools.php
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-constants.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-constants.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-constants.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-constants.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-002.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-002.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-002.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-003.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-003.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-003.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-003.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-004.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-004.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-004.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-004.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-005.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-005.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-ctor_error-005.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-ctor_error-005.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-debug-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-debug-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-debug-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-debug-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-debug-002.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-debug-002.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-debug-002.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-debug-002.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-getjournal-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-getjournal-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-getjournal-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-getjournal-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-getw-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-getw-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-getw-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-getw-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern-getwtimeout-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern-getwtimeout-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern-getwtimeout-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern-getwtimeout-001.phpt
diff --git a/mongodb-1.1.5/tests/writeConcern/writeconcern_error-001.phpt b/mongodb-1.1.6/tests/writeConcern/writeconcern_error-001.phpt
similarity index 100%
rename from mongodb-1.1.5/tests/writeConcern/writeconcern_error-001.phpt
rename to mongodb-1.1.6/tests/writeConcern/writeconcern_error-001.phpt
diff --git a/mongodb-1.1.5/win32/bson-config.h b/mongodb-1.1.6/win32/bson-config.h
similarity index 100%
rename from mongodb-1.1.5/win32/bson-config.h
rename to mongodb-1.1.6/win32/bson-config.h
diff --git a/mongodb-1.1.5/win32/bson-version.h b/mongodb-1.1.6/win32/bson-version.h
similarity index 100%
rename from mongodb-1.1.5/win32/bson-version.h
rename to mongodb-1.1.6/win32/bson-version.h
diff --git a/mongodb-1.1.5/win32/mongoc-config.h b/mongodb-1.1.6/win32/mongoc-config.h
similarity index 100%
rename from mongodb-1.1.5/win32/mongoc-config.h
rename to mongodb-1.1.6/win32/mongoc-config.h
diff --git a/mongodb-1.1.5/win32/mongoc-version.h b/mongodb-1.1.6/win32/mongoc-version.h
similarity index 100%
rename from mongodb-1.1.5/win32/mongoc-version.h
rename to mongodb-1.1.6/win32/mongoc-version.h
diff --git a/package.xml b/package.xml
index a9f34708..b1cc09d5 100644
--- a/package.xml
+++ b/package.xml
@@ -1,693 +1,692 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.10.1" version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.1 http://pear.php.net/dtd/package-2.1.xsd">
+<package packagerversion="1.9.5" version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.1 http://pear.php.net/dtd/package-2.1.xsd">
<name>mongodb</name>
<channel>pecl.php.net</channel>
<summary>MongoDB driver for PHP</summary>
<description>The purpose of this driver is to provide exceptionally thin glue between MongoDB
and PHP, implementing only fundemental and performance-critical components
necessary to build a fully-functional MongoDB driver.</description>
<lead>
<name>Hannes Magnusson</name>
<user>bjori</user>
<email>bjori@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Jeremy Mikola</name>
<user>jmikola</user>
<email>jmikola@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Derick Rethans</name>
<user>derick</user>
<email>derick@php.net</email>
<active>yes</active>
</lead>
- <date>2016-03-18</date>
- <time>17:17:10</time>
+ <date>2016-04-06</date>
+ <time>15:36:04</time>
<version>
- <release>1.1.5</release>
- <api>1.1.5</api>
+ <release>1.1.6</release>
+ <api>1.1.6</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
<notes>
-* PHPC-632: Define MONGOC_NO_AUTOMATIC_GLOBALS when bundling libmongoc
+* PHPC-667: Fix check for existing &quot;_id&quot; field during BulkWrite::insert()
+* PHPC-657: Support MONGOC_NO_AUTOMATIC GLOBALS configure flag
+* PHPC-657: Upgrade libbson and libmongoc to 1.3.5
+* PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
+* PHPC-564: Use macros for accessing write result int32 fields
+* PHPC-564, PHPC-626: WriteResult should use libmongoc&apos;s public API
+* Fix title for PHPC-155 regression test
</notes>
<contents>
<dir name="/">
<file md5sum="b301ead064e031b76fa08488a1055594" name="scripts/centos/ldap/Domain.ldif" role="test" />
<file md5sum="4daa783214593b6d7deb42f35c6e027c" name="scripts/centos/ldap/Users.ldif" role="test" />
<file md5sum="001e9cfe2c64b4afe413c12da3a75103" name="scripts/centos/ldap/basics.ldif" role="test" />
<file md5sum="624db776065d2ce0e76c3dd252c86c27" name="scripts/centos/ldap/install.sh" role="test" />
<file md5sum="3373471c13615482fcb5abd156a99013" name="scripts/centos/ldap/mongod.ldif" role="test" />
<file md5sum="79641e9055dc9a4c810cdc580d420ccf" name="scripts/centos/ldap/pw.ldif" role="test" />
<file md5sum="7069ce3fbf9612eb20df4de56e2915e7" name="scripts/centos/ldap/saslauthd.conf" role="test" />
<file md5sum="c2d1c7b3b12d970c295ebceda4bd429f" name="scripts/centos/ldap/users" role="test" />
<file md5sum="9add0018a9ebebb32e6f9d689d53ce14" name="scripts/centos/essentials.sh" role="test" />
<file md5sum="43a925c212fc965e90d89951d04945c1" name="scripts/freebsd/essentials.sh" role="test" />
<file md5sum="18b03fd810bde00c7493002a94e24865" name="scripts/freebsd/phongo.sh" role="test" />
<file md5sum="0e6d3baeb0ffedee6a4d5500a725331b" name="scripts/presets/replicaset-30.json" role="test" />
<file md5sum="b5c14f08571fcfe2aa5641a7a18d4c3f" name="scripts/presets/replicaset.json" role="test" />
<file md5sum="d850cacbf5527fd7b4a46958e66ed5c9" name="scripts/presets/standalone-24.json" role="test" />
<file md5sum="d9b0cfc2035c3d5c0baae6959a90c36e" name="scripts/presets/standalone-26.json" role="test" />
<file md5sum="60c5e499c429eb07e1f96b37baa42adf" name="scripts/presets/standalone-30.json" role="test" />
<file md5sum="b8cc887e5bccc9bc1f715d041d2d657b" name="scripts/presets/standalone-auth.json" role="test" />
<file md5sum="2bc383470aa5dfc60185ef19a8a80276" name="scripts/presets/standalone-plain.json" role="test" />
<file md5sum="82e65a04030826c41d713787833fb52a" name="scripts/presets/standalone-ssl.json" role="test" />
<file md5sum="c5acd3fbc060927121ff626f3b730cfa" name="scripts/presets/standalone-x509.json" role="test" />
<file md5sum="17927182a5fb8fb9d1ad8c8571c32b29" name="scripts/presets/standalone.json" role="test" />
<file md5sum="06b59105c25447470ca9f7c589b80b46" name="scripts/ssl/ca.pem" role="test" />
<file md5sum="6bdc883fdbe5a1c736518e5ec5f67964" name="scripts/ssl/client.pem" role="test" />
<file md5sum="94a4db9c47b58aa3d00b70b4bd178601" name="scripts/ssl/crl.pem" role="test" />
<file md5sum="bfccd366ca201a01f8f5bea8c900abc9" name="scripts/ssl/server.pem" role="test" />
<file md5sum="cb636b47cf37dace58be73272a74efc3" name="scripts/ubuntu/ldap/install.sh" role="test" />
<file md5sum="c4c1a6c234d983da8fe0382bcb8c1420" name="scripts/ubuntu/ldap/saslauthd.conf" role="test" />
<file md5sum="b199baa1ee52bc252773485de56b10f6" name="scripts/ubuntu/essentials.sh" role="test" />
<file md5sum="b4a9eb39b992590f39b56e4fdbabe757" name="scripts/ubuntu/mongo-orchestration.sh" role="test" />
<file md5sum="903c38a7e9d59fec770c1138de85d7be" name="scripts/ubuntu/phongo.sh" role="test" />
<file md5sum="a51616233fb311f458391b668e0254e9" name="scripts/vmware/kernel.sh" role="test" />
<file md5sum="28868809c797d2b57b0f21bfc66b4862" name="scripts/convert-mo-tests.php" role="test" />
<file md5sum="35671ea9b24b02610710ef676bc539a2" name="scripts/list-servers.php" role="test" />
<file md5sum="43b39f67f12cacf6f21de522b51a2900" name="scripts/start-servers.php" role="test" />
<file md5sum="2aff6f5b11341ea8bd2aa48073fe0a41" name="src/BSON/Binary.c" role="src" />
<file md5sum="0140cb2b40b5b8fd554760cbcadc9d52" name="src/BSON/Javascript.c" role="src" />
<file md5sum="87396d234c6b471c5d8bbb034e0cf668" name="src/BSON/MaxKey.c" role="src" />
<file md5sum="076f14397d034e439ed228028f5db689" name="src/BSON/MinKey.c" role="src" />
<file md5sum="598c43c09bd56d6e05e4d7e16ed13035" name="src/BSON/ObjectID.c" role="src" />
<file md5sum="72126a76a258de87232509920af48ef2" name="src/BSON/Persistable.c" role="src" />
<file md5sum="6f486a7babfcdcf42e8a3fd2861a5f60" name="src/BSON/Regex.c" role="src" />
<file md5sum="36869e001a518cd8b39d59fd1298fbb2" name="src/BSON/Serializable.c" role="src" />
<file md5sum="1ddedf8846157779ad8e56bd3b6caec7" name="src/BSON/Timestamp.c" role="src" />
<file md5sum="ea65791b65f91f4071101d78e7fef85f" name="src/BSON/Type.c" role="src" />
<file md5sum="1df415626848a76a61736aca51ad04c8" name="src/BSON/UTCDateTime.c" role="src" />
<file md5sum="a1b17e2c935bfef0365ac60f589c37de" name="src/BSON/Unserializable.c" role="src" />
<file md5sum="9a7a8d4b102c1cd2bdfc607dad008aa4" name="src/MongoDB/Exception/AuthenticationException.c" role="src" />
<file md5sum="28d4d1baec7f8f4a94891d50dd7bade5" name="src/MongoDB/Exception/BulkWriteException.c" role="src" />
<file md5sum="e2afdbe9298a14efda81a1233f9fa3b5" name="src/MongoDB/Exception/ConnectionException.c" role="src" />
<file md5sum="ef3336318a3fc6b39eb2d7dfd5eda1ed" name="src/MongoDB/Exception/ConnectionTimeoutException.c" role="src" />
<file md5sum="32a30824a1e1f46d6b9b7f9da12f5d1e" name="src/MongoDB/Exception/Exception.c" role="src" />
<file md5sum="3967ba4e71fe8a106e664f721e877976" name="src/MongoDB/Exception/ExecutionTimeoutException.c" role="src" />
<file md5sum="827569a67aa7015e926af2356cf76b6e" name="src/MongoDB/Exception/InvalidArgumentException.c" role="src" />
<file md5sum="5150d3950d83c607d21adad0bf980262" name="src/MongoDB/Exception/LogicException.c" role="src" />
<file md5sum="5f2ff1f090db57bf79f0eb1d84826d5a" name="src/MongoDB/Exception/RuntimeException.c" role="src" />
<file md5sum="8b79c904c889b96ef3a0643829f5f5bf" name="src/MongoDB/Exception/SSLConnectionException.c" role="src" />
<file md5sum="20d7bbf19981dfe2025d6960d0c3f8a4" name="src/MongoDB/Exception/UnexpectedValueException.c" role="src" />
<file md5sum="d8ce1ab3f5c9567756aff5be8200d463" name="src/MongoDB/Exception/WriteException.c" role="src" />
<file md5sum="4f66733a8997ea86ad21010a52fd4813" name="src/MongoDB/BulkWrite.c" role="src" />
<file md5sum="e8b0d29fab22a11de748f4bdb9ae640b" name="src/MongoDB/Command.c" role="src" />
<file md5sum="54d2d5e52b2b8a65fef238a46a55fe1b" name="src/MongoDB/Cursor.c" role="src" />
<file md5sum="8d1a59882d4ddfee25248850592d55dc" name="src/MongoDB/CursorId.c" role="src" />
<file md5sum="2e1ecef47b7d9a03ba78ebe8a56cc077" name="src/MongoDB/Manager.c" role="src" />
<file md5sum="70e4126b280c7056a3389e9490f4971c" name="src/MongoDB/Query.c" role="src" />
<file md5sum="bea72032eab2fb014dd3306ded5485eb" name="src/MongoDB/ReadConcern.c" role="src" />
<file md5sum="f312475cacd0d9e7f61f782dfceb89af" name="src/MongoDB/ReadPreference.c" role="src" />
<file md5sum="c2a75545723d7eae9bd6e2ebd06d6af4" name="src/MongoDB/Server.c" role="src" />
<file md5sum="6c34d611bea660cae7ad77cb5534cde4" name="src/MongoDB/WriteConcern.c" role="src" />
<file md5sum="7957bd6aaafb2d3f28e510d2753ebf59" name="src/MongoDB/WriteConcernError.c" role="src" />
<file md5sum="afabdb7d5cea46776b57f2a7e9c60d54" name="src/MongoDB/WriteError.c" role="src" />
- <file md5sum="2563c2c05263e52d00ceb189fd6213b0" name="src/MongoDB/WriteResult.c" role="src" />
+ <file md5sum="a06dea28aa6135f989102a4cce721ccc" name="src/MongoDB/WriteResult.c" role="src" />
<file md5sum="244fe9a9cf92579e2e7b963773f624a1" name="src/contrib/php-ssl.c" role="src" />
<file md5sum="e2f74b8b4053c218b6b21cda31dcade2" name="src/contrib/php-ssl.h" role="src" />
<file md5sum="3eb4bc184583d52ef59d9909fa96c3ae" name="src/contrib/php_array_api.h" role="src" />
<file md5sum="1066d5c9a05b1b1cb8f4de5a7e291574" name="src/libbson/build/autotools/m4/ac_check_typedef.m4" role="src" />
<file md5sum="e40a5f02f4d82a68b3df43d99dd92ed6" name="src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4" role="src" />
<file md5sum="b96bb8fad4ea5d66c6b3af718186e2e0" name="src/libbson/build/autotools/m4/ac_create_stdint_h.m4" role="src" />
<file md5sum="7b5ee49855c90a9da6a0b1f1f0b8ef8f" name="src/libbson/build/autotools/m4/as-compiler-flag.m4" role="src" />
<file md5sum="8d942f69b5f3c15ecae4b75bb7e80614" name="src/libbson/build/autotools/m4/ax_check_compile_flag.m4" role="src" />
<file md5sum="05bd24609268702a36d50d5edd3661ac" name="src/libbson/build/autotools/m4/ax_check_link_flag.m4" role="src" />
<file md5sum="5535e823ec44002b522873b9c0e2e0bf" name="src/libbson/build/autotools/m4/ax_pthread.m4" role="src" />
- <file md5sum="42a15e936131c8cbcc3c88b839022f8a" name="src/libbson/build/autotools/m4/libtool.m4" role="src" />
- <file md5sum="67d5ebceaac562ddf0dde4e5cdffbe09" name="src/libbson/build/autotools/m4/ltoptions.m4" role="src" />
- <file md5sum="bc2f6032c98896249eadb56177c7d357" name="src/libbson/build/autotools/m4/ltsugar.m4" role="src" />
- <file md5sum="91dd5e1355d100dbdab7d71244ed2625" name="src/libbson/build/autotools/m4/ltversion.m4" role="src" />
- <file md5sum="47d420a13f9ba4e171772c3e3eee3e63" name="src/libbson/build/autotools/m4/lt~obsolete.m4" role="src" />
<file md5sum="ad8d52d54e0f97c0e4e385376ea73bc0" name="src/libbson/build/autotools/m4/pkg.m4" role="src" />
<file md5sum="ff788a8b5eea35b1cc226bb2686c3537" name="src/libbson/build/autotools/m4/silent.m4" role="src" />
<file md5sum="202a123680d63e9f3caae1d52f7b8686" name="src/libbson/build/autotools/AutoHarden.m4" role="src" />
<file md5sum="c78c5e9b49b67a725e831823492642da" name="src/libbson/build/autotools/CheckAtomics.m4" role="src" />
<file md5sum="33c0e73d71ead46ce5a11eda4ce160b6" name="src/libbson/build/autotools/CheckCompiler.m4" role="src" />
<file md5sum="926469dedde20e75214b528528ba25ae" name="src/libbson/build/autotools/CheckHeaders.m4" role="src" />
<file md5sum="81b2b641c597d18daa4066ed7c37d7b7" name="src/libbson/build/autotools/CheckHost.m4" role="src" />
<file md5sum="5147ee8369f1744715365976b38777fc" name="src/libbson/build/autotools/CheckProgs.m4" role="src" />
<file md5sum="fa4a5cc1c9475999c468488eb19e4ffe" name="src/libbson/build/autotools/CheckTarget.m4" role="src" />
<file md5sum="3154e253512bd82d0dd51898d5cfde90" name="src/libbson/build/autotools/Coverage.m4" role="src" />
<file md5sum="46768d326c5f994af7e1ffbb0db32a4e" name="src/libbson/build/autotools/Endian.m4" role="src" />
<file md5sum="46d6ff4f547824ce9f5869b0f1a91df7" name="src/libbson/build/autotools/FindDependencies.m4" role="src" />
<file md5sum="7cb405e39a2f8c5c5fa2ffa4315df98a" name="src/libbson/build/autotools/LDVersionScript.m4" role="src" />
<file md5sum="71cf2e639791835caf686cafb2e0a131" name="src/libbson/build/autotools/MaintainerFlags.m4" role="src" />
<file md5sum="2bfa5427bd07a9816cca2f3dc60f0201" name="src/libbson/build/autotools/Optimizations.m4" role="src" />
<file md5sum="6132a3601eb0bc5de5ffc63316261abe" name="src/libbson/build/autotools/PrintBuildConfiguration.m4" role="src" />
<file md5sum="01ce2a3d099737ae11530c08ad2455e2" name="src/libbson/build/autotools/ReadCommandLineArguments.m4" role="src" />
<file md5sum="a5cb66d4eb8a5a4ef088e96e213bbfec" name="src/libbson/build/autotools/SetupAutomake.m4" role="src" />
<file md5sum="f229599b4333a2cdf5be29136cc6f2e2" name="src/libbson/build/autotools/SetupLibtool.m4" role="src" />
<file md5sum="2e50f9a74b7624536d967c01897fd22e" name="src/libbson/build/autotools/Versions.m4" role="src" />
<file md5sum="60d5834d66c34c59c0a12a7eecbf84ab" name="src/libbson/src/bson/b64_ntop.h" role="src" />
<file md5sum="70cebe2a7a17de7d489317b7a1db7c73" name="src/libbson/src/bson/b64_pton.h" role="src" />
<file md5sum="bb09a154c8beb0c3a8bb3e33806e86a3" name="src/libbson/src/bson/bcon.c" role="src" />
<file md5sum="3c0add458971f01ef4bbd6f92beacb04" name="src/libbson/src/bson/bcon.h" role="src" />
<file md5sum="390455394d8d976b6b3b472845cdd6c2" name="src/libbson/src/bson/bson-atomic.c" role="src" />
<file md5sum="a2f2ae100db5d6602c323b9993305893" name="src/libbson/src/bson/bson-atomic.h" role="src" />
<file md5sum="e005ee43ff5516ada7a8afb103310f5c" name="src/libbson/src/bson/bson-clock.c" role="src" />
<file md5sum="c0e771385f32369c59ba3de570b854c9" name="src/libbson/src/bson/bson-clock.h" role="src" />
<file md5sum="8f76e2f45df2644215e0969e947d9a87" name="src/libbson/src/bson/bson-compat.h" role="src" />
<file md5sum="4819fcff6b12651ee5c6e30c51a98ac2" name="src/libbson/src/bson/bson-config.h" role="src" />
<file md5sum="810ccc4283632659bf59c2ab7ae927cf" name="src/libbson/src/bson/bson-config.h.in" role="src" />
<file md5sum="11177a64ea0d8136b73312d0e9313dae" name="src/libbson/src/bson/bson-context-private.h" role="src" />
<file md5sum="26bbea92a38eb020f99c31006fe8e1cc" name="src/libbson/src/bson/bson-context.c" role="src" />
<file md5sum="bc4ed2208b0f062619391e27c35b3716" name="src/libbson/src/bson/bson-context.h" role="src" />
<file md5sum="a8d2b6f9a285e267c372ec7e3def2258" name="src/libbson/src/bson/bson-endian.h" role="src" />
<file md5sum="94281be1939683f40c2e4b8eb869a385" name="src/libbson/src/bson/bson-error.c" role="src" />
<file md5sum="c6aac7116527ebd525bd04d2c5675ce4" name="src/libbson/src/bson/bson-error.h" role="src" />
<file md5sum="be7c0192246dad6a30b0f3835380c343" name="src/libbson/src/bson/bson-iso8601-private.h" role="src" />
<file md5sum="bcbaf2a59bc63350978d2be3401118bb" name="src/libbson/src/bson/bson-iso8601.c" role="src" />
<file md5sum="1822df11997a072bac645885340bc3a1" name="src/libbson/src/bson/bson-iter.c" role="src" />
<file md5sum="9820ad956c26006311cb6d3a5ab6bf37" name="src/libbson/src/bson/bson-iter.h" role="src" />
<file md5sum="ed2d17d49d387f587840af4fa8a237ac" name="src/libbson/src/bson/bson-json.c" role="src" />
<file md5sum="53a9cbbe5c9a58fc4790c1e995e2db29" name="src/libbson/src/bson/bson-json.h" role="src" />
<file md5sum="30bfe359c194f01ffbf1afe053c4f16c" name="src/libbson/src/bson/bson-keys.c" role="src" />
<file md5sum="360489fa7642c546ad50ccacf6fa7b7d" name="src/libbson/src/bson/bson-keys.h" role="src" />
<file md5sum="0751ce4fa7b4eb1fe139c68751f73726" name="src/libbson/src/bson/bson-macros.h" role="src" />
<file md5sum="016da785f4bd6ed2654a1dd6e7e20711" name="src/libbson/src/bson/bson-md5.c" role="src" />
<file md5sum="a25556f4057e5366dd4b9f72705fac46" name="src/libbson/src/bson/bson-md5.h" role="src" />
<file md5sum="b6516065288b9d39daec78b83111601d" name="src/libbson/src/bson/bson-memory.c" role="src" />
<file md5sum="031c3330610a564ac5c95f61c4fe4cd5" name="src/libbson/src/bson/bson-memory.h" role="src" />
<file md5sum="71aadcb44d35f3ff2e7a11f39732d46d" name="src/libbson/src/bson/bson-oid.c" role="src" />
<file md5sum="1717085c9b662b4a351823b1b3687a49" name="src/libbson/src/bson/bson-oid.h" role="src" />
<file md5sum="79fcf67477764ea451076437d4ec717c" name="src/libbson/src/bson/bson-private.h" role="src" />
<file md5sum="4d876db12b4b19f17ffcafc1b6488861" name="src/libbson/src/bson/bson-reader.c" role="src" />
<file md5sum="fa9d0dcbb77842c38f75deba2531b154" name="src/libbson/src/bson/bson-reader.h" role="src" />
<file md5sum="d4277ba8b3bc0f7753931062eb0cd5eb" name="src/libbson/src/bson/bson-stdint-win32.h" role="src" />
- <file md5sum="ef0c8f0578bcf2f961d209172ff6e5a0" name="src/libbson/src/bson/bson-stdint.h" role="src" />
+ <file md5sum="01dce16965855e4a092a8d5188e40312" name="src/libbson/src/bson/bson-stdint.h" role="src" />
<file md5sum="426c704e288104d8dd87cbbbeca9aa51" name="src/libbson/src/bson/bson-string.c" role="src" />
<file md5sum="4ecbd4e7bf09ede19374cd87d4155164" name="src/libbson/src/bson/bson-string.h" role="src" />
<file md5sum="2a16019c51864483f27676c83e12b293" name="src/libbson/src/bson/bson-thread-private.h" role="src" />
<file md5sum="bbe5863f79868d0a153f9eb591f09f20" name="src/libbson/src/bson/bson-timegm-private.h" role="src" />
<file md5sum="b27b64de5376b5b4b53721d96bf331e9" name="src/libbson/src/bson/bson-timegm.c" role="src" />
<file md5sum="6ac9daeee445b35fc73363beca0967f9" name="src/libbson/src/bson/bson-types.h" role="src" />
<file md5sum="2569921096086498f3b7e84dd37aea1b" name="src/libbson/src/bson/bson-utf8.c" role="src" />
<file md5sum="82b66ce5a87930b09a0b7ec8bf20e2f1" name="src/libbson/src/bson/bson-utf8.h" role="src" />
<file md5sum="ee95977dddde8a36cf53007dfd221c49" name="src/libbson/src/bson/bson-value.c" role="src" />
<file md5sum="34889442e7c5e4c54c3c60b2e0f77ebd" name="src/libbson/src/bson/bson-value.h" role="src" />
<file md5sum="f80a6f4a82a8c86f63eaccc1c8d147ee" name="src/libbson/src/bson/bson-version-functions.c" role="src" />
<file md5sum="b60ecb89018a8fa6ca6d16fd089ce952" name="src/libbson/src/bson/bson-version-functions.h" role="src" />
- <file md5sum="9a494ba74d40307a81c07939b944615a" name="src/libbson/src/bson/bson-version.h" role="src" />
+ <file md5sum="d1485faa37ae97cbbbd511ad558397e7" name="src/libbson/src/bson/bson-version.h" role="src" />
<file md5sum="9036341d3488d5aec2b028fae66c8c6f" name="src/libbson/src/bson/bson-version.h.in" role="src" />
<file md5sum="8108f0a5dd05650f53c3c2eca95d587c" name="src/libbson/src/bson/bson-writer.c" role="src" />
<file md5sum="0aea55fb0deab9311812eefc9a0291d5" name="src/libbson/src/bson/bson-writer.h" role="src" />
<file md5sum="a964beb80a921c5a2cfbaf4ce445ec40" name="src/libbson/src/bson/bson.c" role="src" />
<file md5sum="1a1612a74a8628aa1912c400c5948592" name="src/libbson/src/bson/bson.h" role="src" />
<file md5sum="cf5990b5d3ad3eafa329f4e6884582c5" name="src/libbson/src/yajl/yajl.c" role="src" />
<file md5sum="1c55df90c4d949c316e6e6e7498ec15c" name="src/libbson/src/yajl/yajl_alloc.c" role="src" />
<file md5sum="f3f9167846f7260138bd38021f9bb189" name="src/libbson/src/yajl/yajl_alloc.h" role="src" />
<file md5sum="289df9f01dc8865130659219e517a4b4" name="src/libbson/src/yajl/yajl_buf.c" role="src" />
<file md5sum="505cbe3ad7cbbb5579cecc86c8f93087" name="src/libbson/src/yajl/yajl_buf.h" role="src" />
<file md5sum="0963d85f30e3afa40fb4ae813ab046c1" name="src/libbson/src/yajl/yajl_bytestack.h" role="src" />
<file md5sum="d661bd5df38065b1de3e9b75309cb78b" name="src/libbson/src/yajl/yajl_common.h" role="src" />
<file md5sum="b60b45eb35dd40f2b3825233fa9661bc" name="src/libbson/src/yajl/yajl_encode.c" role="src" />
<file md5sum="5644d79572411e06f808ee0c9e76a41b" name="src/libbson/src/yajl/yajl_encode.h" role="src" />
<file md5sum="7b647b5ae0eca31484d0543e969cbaa4" name="src/libbson/src/yajl/yajl_gen.c" role="src" />
<file md5sum="e57e21bda1283a3a6a178845096b5d9c" name="src/libbson/src/yajl/yajl_gen.h" role="src" />
<file md5sum="c1e82830be32f2027d9936244237b3f9" name="src/libbson/src/yajl/yajl_lex.c" role="src" />
<file md5sum="dcada0f60f8121bf68b73d56f32273b6" name="src/libbson/src/yajl/yajl_lex.h" role="src" />
<file md5sum="ebd7e4faccaa0f454945be170f447eef" name="src/libbson/src/yajl/yajl_parse.h" role="src" />
<file md5sum="a975a6d331f72f5c481c828cbf549788" name="src/libbson/src/yajl/yajl_parser.c" role="src" />
<file md5sum="927906b0423c3d1412188b6686821f2e" name="src/libbson/src/yajl/yajl_parser.h" role="src" />
<file md5sum="a0ee19c679c295449de6bbdae05ef82d" name="src/libbson/src/yajl/yajl_tree.c" role="src" />
<file md5sum="69650cd70a46ddf7541401203b22f00d" name="src/libbson/src/yajl/yajl_tree.h" role="src" />
<file md5sum="8d8be470862bf4c55ee6344530e8eb38" name="src/libbson/src/yajl/yajl_version.c" role="src" />
<file md5sum="4194a43380dfaef3ca94cb2ba30da1f2" name="src/libbson/src/yajl/yajl_version.h" role="src" />
- <file md5sum="5b28ee398da148313e912a0c08d76ba4" name="src/libbson/VERSION_CURRENT" role="src" />
- <file md5sum="5b28ee398da148313e912a0c08d76ba4" name="src/libbson/VERSION_RELEASED" role="src" />
+ <file md5sum="f82208cb1a0eac11d8d5726958ce9104" name="src/libbson/VERSION_CURRENT" role="src" />
+ <file md5sum="f82208cb1a0eac11d8d5726958ce9104" name="src/libbson/VERSION_RELEASED" role="src" />
<file md5sum="1066d5c9a05b1b1cb8f4de5a7e291574" name="src/libmongoc/build/autotools/m4/ac_check_typedef.m4" role="src" />
<file md5sum="e40a5f02f4d82a68b3df43d99dd92ed6" name="src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4" role="src" />
<file md5sum="b96bb8fad4ea5d66c6b3af718186e2e0" name="src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4" role="src" />
<file md5sum="7b5ee49855c90a9da6a0b1f1f0b8ef8f" name="src/libmongoc/build/autotools/m4/as-compiler-flag.m4" role="src" />
<file md5sum="8d942f69b5f3c15ecae4b75bb7e80614" name="src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4" role="src" />
<file md5sum="05bd24609268702a36d50d5edd3661ac" name="src/libmongoc/build/autotools/m4/ax_check_link_flag.m4" role="src" />
<file md5sum="5535e823ec44002b522873b9c0e2e0bf" name="src/libmongoc/build/autotools/m4/ax_pthread.m4" role="src" />
- <file md5sum="42a15e936131c8cbcc3c88b839022f8a" name="src/libmongoc/build/autotools/m4/libtool.m4" role="src" />
- <file md5sum="67d5ebceaac562ddf0dde4e5cdffbe09" name="src/libmongoc/build/autotools/m4/ltoptions.m4" role="src" />
- <file md5sum="bc2f6032c98896249eadb56177c7d357" name="src/libmongoc/build/autotools/m4/ltsugar.m4" role="src" />
- <file md5sum="91dd5e1355d100dbdab7d71244ed2625" name="src/libmongoc/build/autotools/m4/ltversion.m4" role="src" />
- <file md5sum="47d420a13f9ba4e171772c3e3eee3e63" name="src/libmongoc/build/autotools/m4/lt~obsolete.m4" role="src" />
<file md5sum="ad8d52d54e0f97c0e4e385376ea73bc0" name="src/libmongoc/build/autotools/m4/pkg.m4" role="src" />
<file md5sum="ff788a8b5eea35b1cc226bb2686c3537" name="src/libmongoc/build/autotools/m4/silent.m4" role="src" />
<file md5sum="eed82d92d773f81cdd1e8e72566630ef" name="src/libmongoc/build/autotools/AutoHarden.m4" role="src" />
+ <file md5sum="7c20548ba18d4b99f89203d853809bfc" name="src/libmongoc/build/autotools/AutomaticInitAndCleanup.m4" role="src" />
<file md5sum="33c0e73d71ead46ce5a11eda4ce160b6" name="src/libmongoc/build/autotools/CheckCompiler.m4" role="src" />
<file md5sum="81b2b641c597d18daa4066ed7c37d7b7" name="src/libmongoc/build/autotools/CheckHost.m4" role="src" />
<file md5sum="74f0234144b9b05ecc5d2b512bdce9cc" name="src/libmongoc/build/autotools/CheckProgs.m4" role="src" />
<file md5sum="5311dc948526452f2fd3635c2f214aee" name="src/libmongoc/build/autotools/CheckSSL.m4" role="src" />
<file md5sum="b73c192220884fb09e05d919b1513b33" name="src/libmongoc/build/autotools/CheckSasl.m4" role="src" />
<file md5sum="fa4a5cc1c9475999c468488eb19e4ffe" name="src/libmongoc/build/autotools/CheckTarget.m4" role="src" />
<file md5sum="3154e253512bd82d0dd51898d5cfde90" name="src/libmongoc/build/autotools/Coverage.m4" role="src" />
<file md5sum="e8fb530e79b3212551151dd9fef1e92a" name="src/libmongoc/build/autotools/FindDependencies.m4" role="src" />
<file md5sum="7cb405e39a2f8c5c5fa2ffa4315df98a" name="src/libmongoc/build/autotools/LDVersionScript.m4" role="src" />
<file md5sum="a8977370dbf28d606e4a6628bba94fca" name="src/libmongoc/build/autotools/Libbson.m4" role="src" />
<file md5sum="00d73a290be3d6ad39c986fbe09279b8" name="src/libmongoc/build/autotools/MaintainerFlags.m4" role="src" />
<file md5sum="0a8ff4918426dfc83ea7c741a512029d" name="src/libmongoc/build/autotools/Optimizations.m4" role="src" />
<file md5sum="f3ef6e9a19741a92ccfd23c38c8127b3" name="src/libmongoc/build/autotools/PlatformFlags.m4" role="src" />
- <file md5sum="2f36be74b949fc70bb2fc6861f455362" name="src/libmongoc/build/autotools/PrintBuildConfiguration.m4" role="src" />
- <file md5sum="b461d5a26ffd5de93a63c5287303675e" name="src/libmongoc/build/autotools/ReadCommandLineArguments.m4" role="src" />
+ <file md5sum="b47f45f1e1468f862598ff8d33e45c52" name="src/libmongoc/build/autotools/PrintBuildConfiguration.m4" role="src" />
+ <file md5sum="6208a017b47a9544b87c9764e3cb34d4" name="src/libmongoc/build/autotools/ReadCommandLineArguments.m4" role="src" />
<file md5sum="572566950ac77d916d6bf73fde7b8395" name="src/libmongoc/build/autotools/SetupAutomake.m4" role="src" />
<file md5sum="f229599b4333a2cdf5be29136cc6f2e2" name="src/libmongoc/build/autotools/SetupLibtool.m4" role="src" />
<file md5sum="82639d82b348fc309980a1d14e96b462" name="src/libmongoc/build/autotools/Versions.m4" role="src" />
<file md5sum="76e2c1a2aa19f5fab3661c992ac603fa" name="src/libmongoc/build/autotools/WeakSymbols.m4" role="src" />
<file md5sum="cebe632a500714618bcd504042665d06" name="src/libmongoc/src/mongoc/mongoc-array-private.h" role="src" />
<file md5sum="62bb69dffa4d2756c43bb06276cc6cc9" name="src/libmongoc/src/mongoc/mongoc-array.c" role="src" />
<file md5sum="b90b9c2c441ef50589aa5b4a40322fdb" name="src/libmongoc/src/mongoc/mongoc-async-cmd-private.h" role="src" />
<file md5sum="69a8374d05fda8cf8b698183d80c7cef" name="src/libmongoc/src/mongoc/mongoc-async-cmd.c" role="src" />
<file md5sum="aee92f5c2e025fd3dc8da9637824a072" name="src/libmongoc/src/mongoc/mongoc-async-private.h" role="src" />
<file md5sum="1d94a4dad26b26d3fa18e8012ebaa413" name="src/libmongoc/src/mongoc/mongoc-async.c" role="src" />
<file md5sum="ddce6cc55b0dc69c11da1c8706462e1e" name="src/libmongoc/src/mongoc/mongoc-b64-private.h" role="src" />
<file md5sum="6bcdf787033705c8d56d5ab6d2d5f152" name="src/libmongoc/src/mongoc/mongoc-b64.c" role="src" />
<file md5sum="4671ed096a020fe21ba8342fb16abb0c" name="src/libmongoc/src/mongoc/mongoc-buffer-private.h" role="src" />
<file md5sum="4190e1c4e5c039a33779dfd235c298ce" name="src/libmongoc/src/mongoc/mongoc-buffer.c" role="src" />
<file md5sum="2e2f075cda3b44aec0a44e2985bc6316" name="src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h" role="src" />
<file md5sum="b8da8964136fa61867aba3d0f0def7fc" name="src/libmongoc/src/mongoc/mongoc-bulk-operation.c" role="src" />
<file md5sum="2b0d8dff8b812c86c52dc0601951b952" name="src/libmongoc/src/mongoc/mongoc-bulk-operation.h" role="src" />
<file md5sum="58d77a197aac11accb0b0337ccfaafde" name="src/libmongoc/src/mongoc/mongoc-client-pool-private.h" role="src" />
<file md5sum="027282b68b61199b949dc86c9adab3b3" name="src/libmongoc/src/mongoc/mongoc-client-pool.c" role="src" />
<file md5sum="157c8b070899d5ccb1af77a881c37b49" name="src/libmongoc/src/mongoc/mongoc-client-pool.h" role="src" />
<file md5sum="8a35ae96824e78b9df5d2348f416de53" name="src/libmongoc/src/mongoc/mongoc-client-private.h" role="src" />
- <file md5sum="79d834550d454ceece5175f74bf79ca4" name="src/libmongoc/src/mongoc/mongoc-client.c" role="src" />
+ <file md5sum="7a524ad0bd932a5505b8529720d426f9" name="src/libmongoc/src/mongoc/mongoc-client.c" role="src" />
<file md5sum="838f803105ad29caa6951272965ce715" name="src/libmongoc/src/mongoc/mongoc-client.h" role="src" />
<file md5sum="e618322d311598a9ece14cb9149ad8d8" name="src/libmongoc/src/mongoc/mongoc-cluster-private.h" role="src" />
- <file md5sum="ad58f0796a92ceea692192f8790d0f6d" name="src/libmongoc/src/mongoc/mongoc-cluster.c" role="src" />
+ <file md5sum="c21d171e0266322b9ca8c4907332076a" name="src/libmongoc/src/mongoc/mongoc-cluster.c" role="src" />
<file md5sum="15722c59ad5969b1a3cac31ba2e8e005" name="src/libmongoc/src/mongoc/mongoc-collection-private.h" role="src" />
<file md5sum="59f63019be12f0cfc1a4fbf474c701ea" name="src/libmongoc/src/mongoc/mongoc-collection.c" role="src" />
<file md5sum="ead7a19ab678217ac91ce4fd6aae9469" name="src/libmongoc/src/mongoc/mongoc-collection.h" role="src" />
- <file md5sum="b2e49cce9cc87c596c8471ed51f8c598" name="src/libmongoc/src/mongoc/mongoc-config.h" role="src" />
- <file md5sum="4f99537fd0006a2ed2ce7077ba4d0c53" name="src/libmongoc/src/mongoc/mongoc-config.h.in" role="src" />
+ <file md5sum="cd0e1b6dbdbd3ad1b8b2ae977913f7db" name="src/libmongoc/src/mongoc/mongoc-config.h" role="src" />
+ <file md5sum="3f0b44afe3aec76c98015de5df58936a" name="src/libmongoc/src/mongoc/mongoc-config.h.in" role="src" />
<file md5sum="1f31f3242a56bde2eda583777e9be5d0" name="src/libmongoc/src/mongoc/mongoc-counters-private.h" role="src" />
<file md5sum="0b0f0940265bd265554b09c36f0d5bd8" name="src/libmongoc/src/mongoc/mongoc-counters.c" role="src" />
<file md5sum="4bf259bbc90203a8a52270f2c9c473f7" name="src/libmongoc/src/mongoc/mongoc-counters.defs" role="src" />
<file md5sum="4bcf3556ba089250ac6e1ddb54b1647a" name="src/libmongoc/src/mongoc/mongoc-cursor-array-private.h" role="src" />
<file md5sum="5c433648a02845357a4c292150a305a4" name="src/libmongoc/src/mongoc/mongoc-cursor-array.c" role="src" />
<file md5sum="36f631b67d7867fa047f690e63577f8c" name="src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h" role="src" />
<file md5sum="8dc4f6594cf34015033c38b0d72c2fef" name="src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c" role="src" />
<file md5sum="5f864093002f4fcfaf2fd6ba529a93b9" name="src/libmongoc/src/mongoc/mongoc-cursor-private.h" role="src" />
<file md5sum="9cbe4f04279d1d3c6e1c6c3b878c9e11" name="src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h" role="src" />
<file md5sum="2700b1f603ffb52c0e22d04f437f983e" name="src/libmongoc/src/mongoc/mongoc-cursor-transform.c" role="src" />
<file md5sum="753c6e5a827b2393048b02db00d96471" name="src/libmongoc/src/mongoc/mongoc-cursor.c" role="src" />
<file md5sum="6616bbe8a95bc5beb53a5207d431a0d5" name="src/libmongoc/src/mongoc/mongoc-cursor.h" role="src" />
<file md5sum="2807a008970f8b2078537c076751e438" name="src/libmongoc/src/mongoc/mongoc-database-private.h" role="src" />
<file md5sum="2bda4c14361c2e6b39c1262c397e13d6" name="src/libmongoc/src/mongoc/mongoc-database.c" role="src" />
<file md5sum="8145f76bd48c642f903d31cfaf24153d" name="src/libmongoc/src/mongoc/mongoc-database.h" role="src" />
<file md5sum="f2f66f58d8c27cd003ef25f7382d7b21" name="src/libmongoc/src/mongoc/mongoc-errno-private.h" role="src" />
<file md5sum="17eca5b9306d109b6eabdc642f5006de" name="src/libmongoc/src/mongoc/mongoc-error.h" role="src" />
<file md5sum="3ea600e636277422052b45817ddb765c" name="src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h" role="src" />
<file md5sum="f1bea46496e521019b9f47b9d18a52a6" name="src/libmongoc/src/mongoc/mongoc-find-and-modify.c" role="src" />
<file md5sum="b2d02e24e69b1ac0ef15a27b3b222402" name="src/libmongoc/src/mongoc/mongoc-find-and-modify.h" role="src" />
<file md5sum="a451f9575924b096df541a3159876a7e" name="src/libmongoc/src/mongoc/mongoc-flags.h" role="src" />
<file md5sum="7221be0c03bcf8197100ee592bcd0421" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h" role="src" />
<file md5sum="c381845c1aecd1f0c753c69038204f44" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c" role="src" />
<file md5sum="8d7a1b16810791074fe071d8d75a7374" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h" role="src" />
<file md5sum="3a0401e433cb6691f798497b19a27faf" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h" role="src" />
<file md5sum="fff294b867bf83dd3711ee3665e27127" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c" role="src" />
<file md5sum="bd1c523d758a24e137e3ab9073e22664" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h" role="src" />
<file md5sum="8126f403eebf969f10133c91688693a8" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h" role="src" />
<file md5sum="d273b88f79206c1c85a455535d506023" name="src/libmongoc/src/mongoc/mongoc-gridfs-file.c" role="src" />
<file md5sum="00b70108474e3a3cff6ecc11e8b36b85" name="src/libmongoc/src/mongoc/mongoc-gridfs-file.h" role="src" />
<file md5sum="5b58027f4adfe99b4dd02d74845674e6" name="src/libmongoc/src/mongoc/mongoc-gridfs-private.h" role="src" />
<file md5sum="8ffde8c91dfaaec31f0e28fd2f95f272" name="src/libmongoc/src/mongoc/mongoc-gridfs.c" role="src" />
<file md5sum="0411f5526c8bdc64ce67b45037d9c402" name="src/libmongoc/src/mongoc/mongoc-gridfs.h" role="src" />
<file md5sum="e85d3190970eceda6bd30794e19f6320" name="src/libmongoc/src/mongoc/mongoc-host-list-private.h" role="src" />
<file md5sum="5ad5435d0cdb0637089e0825fb41a58c" name="src/libmongoc/src/mongoc/mongoc-host-list.c" role="src" />
<file md5sum="4294099976ce13b16ccd9f1e054ecd4e" name="src/libmongoc/src/mongoc/mongoc-host-list.h" role="src" />
<file md5sum="78c8c87966ee07cde3038e8a6b8ac064" name="src/libmongoc/src/mongoc/mongoc-index.c" role="src" />
<file md5sum="8651a3a3de2b4a3e62e5de7445db05a6" name="src/libmongoc/src/mongoc/mongoc-index.h" role="src" />
- <file md5sum="c278a5ff07c3eb8647d0cd1b1248c8ec" name="src/libmongoc/src/mongoc/mongoc-init.c" role="src" />
+ <file md5sum="63c922ae1e252d32f06381c168a8102f" name="src/libmongoc/src/mongoc/mongoc-init.c" role="src" />
<file md5sum="2e7f045a0b31e9e7f0b1dcbdcf994dde" name="src/libmongoc/src/mongoc/mongoc-init.h" role="src" />
<file md5sum="952d463b654e44a66123cd8883b59748" name="src/libmongoc/src/mongoc/mongoc-iovec.h" role="src" />
<file md5sum="e5896d28954c789851bdc41a354137e3" name="src/libmongoc/src/mongoc/mongoc-list-private.h" role="src" />
<file md5sum="01f733a69d79f45e7a8b7a01fd9b61e1" name="src/libmongoc/src/mongoc/mongoc-list.c" role="src" />
<file md5sum="f22dd13ca5baf5f077957ad69f1980f7" name="src/libmongoc/src/mongoc/mongoc-log-private.h" role="src" />
<file md5sum="d7a77f863ca9891bdef2df7e56d39ea0" name="src/libmongoc/src/mongoc/mongoc-log.c" role="src" />
<file md5sum="c5cb2612a9de7a5547e346c56f73fce1" name="src/libmongoc/src/mongoc/mongoc-log.h" role="src" />
<file md5sum="e810e7f6c293f7ec50087199489e4d1b" name="src/libmongoc/src/mongoc/mongoc-matcher-op-private.h" role="src" />
<file md5sum="d134ab092926a9e19b4dd14f85122681" name="src/libmongoc/src/mongoc/mongoc-matcher-op.c" role="src" />
<file md5sum="95c2c9fabd8b98d069bf991bd4ab09c2" name="src/libmongoc/src/mongoc/mongoc-matcher-private.h" role="src" />
<file md5sum="34d9b266424c63145eb1b9fa4f8e4d49" name="src/libmongoc/src/mongoc/mongoc-matcher.c" role="src" />
<file md5sum="60b8b16f9f2755afdf9200d03fd8c0e8" name="src/libmongoc/src/mongoc/mongoc-matcher.h" role="src" />
<file md5sum="f8775a67f08ccf3c0a37e78e262bd1db" name="src/libmongoc/src/mongoc/mongoc-memcmp-private.h" role="src" />
<file md5sum="7a2c50776b0cb3d84b1463d5da8f9571" name="src/libmongoc/src/mongoc/mongoc-memcmp.c" role="src" />
<file md5sum="a85087cd67361993a945ecddce1b8ff3" name="src/libmongoc/src/mongoc/mongoc-opcode-private.h" role="src" />
<file md5sum="2fd75713af0b61664ca7947837b00282" name="src/libmongoc/src/mongoc/mongoc-opcode.c" role="src" />
<file md5sum="cb8c7ee22278ab7c4e17223deb233dcf" name="src/libmongoc/src/mongoc/mongoc-opcode.h" role="src" />
<file md5sum="1f331502e7732bf78818f6c091edc0a0" name="src/libmongoc/src/mongoc/mongoc-queue-private.h" role="src" />
<file md5sum="32104ba20ad54be40b325e16b12d9c00" name="src/libmongoc/src/mongoc/mongoc-queue.c" role="src" />
<file md5sum="629eb2e4cb793d3df56eccad22fda408" name="src/libmongoc/src/mongoc/mongoc-rand-private.h" role="src" />
<file md5sum="2aac2e1c9ad4562ac60b1cd9fecc1dd5" name="src/libmongoc/src/mongoc/mongoc-rand.c" role="src" />
<file md5sum="8df03b94f2f9f6579c18df1e638ce104" name="src/libmongoc/src/mongoc/mongoc-rand.h" role="src" />
<file md5sum="7191582d07d7de03dd875008d79afe9d" name="src/libmongoc/src/mongoc/mongoc-read-concern-private.h" role="src" />
<file md5sum="9363321e0fb76f61035f43693b6ce987" name="src/libmongoc/src/mongoc/mongoc-read-concern.c" role="src" />
<file md5sum="2b593492cfde89109dc6c38f8f3d7b06" name="src/libmongoc/src/mongoc/mongoc-read-concern.h" role="src" />
<file md5sum="413e9c5e77049ea6be01d1ec35d3cde3" name="src/libmongoc/src/mongoc/mongoc-read-prefs-private.h" role="src" />
<file md5sum="b14c4532f424c935a9b892f1a9a12bb1" name="src/libmongoc/src/mongoc/mongoc-read-prefs.c" role="src" />
<file md5sum="461ac5979473d51f5f48c13fb44e0a29" name="src/libmongoc/src/mongoc/mongoc-read-prefs.h" role="src" />
<file md5sum="27be0f303ab3112f3cb7c7b8cc6388df" name="src/libmongoc/src/mongoc/mongoc-rpc-private.h" role="src" />
<file md5sum="79e6a14df9771fb802a8d48d1f39ee89" name="src/libmongoc/src/mongoc/mongoc-rpc.c" role="src" />
<file md5sum="d4dce2c0eae43640d837886d6859d731" name="src/libmongoc/src/mongoc/mongoc-sasl-private.h" role="src" />
<file md5sum="b7f4ba6d5da7444f0a1f756580537c5f" name="src/libmongoc/src/mongoc/mongoc-sasl.c" role="src" />
<file md5sum="316a128390a4effb8679c93001d5a81f" name="src/libmongoc/src/mongoc/mongoc-scram-private.h" role="src" />
<file md5sum="faef7ecc6c5aef6af46a5220f6c8af11" name="src/libmongoc/src/mongoc/mongoc-scram.c" role="src" />
<file md5sum="bcff14cf8a4c1be42c0ee252cee0b7f9" name="src/libmongoc/src/mongoc/mongoc-server-description-private.h" role="src" />
<file md5sum="f1d29fa2e8e830f70e47b7ee6d7ef484" name="src/libmongoc/src/mongoc/mongoc-server-description.c" role="src" />
<file md5sum="e890f31a55697373a0fe78779d6f6a1b" name="src/libmongoc/src/mongoc/mongoc-server-description.h" role="src" />
<file md5sum="17072d626c8bbbc5e615b21c1894cabb" name="src/libmongoc/src/mongoc/mongoc-server-stream-private.h" role="src" />
<file md5sum="ede84d32df4492a63bf755e2d2c65277" name="src/libmongoc/src/mongoc/mongoc-server-stream.c" role="src" />
<file md5sum="88280d22e22512d18d7f0ef9984e19f3" name="src/libmongoc/src/mongoc/mongoc-set-private.h" role="src" />
<file md5sum="ece9697b7e642474217e6c9206965515" name="src/libmongoc/src/mongoc/mongoc-set.c" role="src" />
<file md5sum="83783d033809df281750fb753a46a19c" name="src/libmongoc/src/mongoc/mongoc-socket-private.h" role="src" />
<file md5sum="f9c50f0171562a5f1ee4839740eba7e8" name="src/libmongoc/src/mongoc/mongoc-socket.c" role="src" />
<file md5sum="fad2ef691dada43693e23258ce38edd1" name="src/libmongoc/src/mongoc/mongoc-socket.h" role="src" />
<file md5sum="f7ef8d9af5b819c487ecea62556c7cb0" name="src/libmongoc/src/mongoc/mongoc-ssl-private.h" role="src" />
<file md5sum="a0f3b695c8cf5b4d78acce2b52b99a54" name="src/libmongoc/src/mongoc/mongoc-ssl.c" role="src" />
<file md5sum="31994e5f8251ec608848ae77c3e4bc0f" name="src/libmongoc/src/mongoc/mongoc-ssl.h" role="src" />
<file md5sum="cec9870de7bcad60452190be1810299c" name="src/libmongoc/src/mongoc/mongoc-stream-buffered.c" role="src" />
<file md5sum="219b98e834e09f07cc30531e23e5196e" name="src/libmongoc/src/mongoc/mongoc-stream-buffered.h" role="src" />
<file md5sum="40728e6d49f64fef38adf55eb005b285" name="src/libmongoc/src/mongoc/mongoc-stream-file.c" role="src" />
<file md5sum="251e3ad92a9e7c848cd969bf11f36224" name="src/libmongoc/src/mongoc/mongoc-stream-file.h" role="src" />
<file md5sum="acb34825ac1914c7887459e4bb29bd0b" name="src/libmongoc/src/mongoc/mongoc-stream-gridfs.c" role="src" />
<file md5sum="7466a71b6513a5c2ecc28944a2d7cc07" name="src/libmongoc/src/mongoc/mongoc-stream-gridfs.h" role="src" />
<file md5sum="8a5bd28c3854d5737d2008ac2f431c5e" name="src/libmongoc/src/mongoc/mongoc-stream-private.h" role="src" />
<file md5sum="ca854886b6c2de590271ed84ee375727" name="src/libmongoc/src/mongoc/mongoc-stream-socket.c" role="src" />
<file md5sum="a244649d298edb48b3b7e84693526861" name="src/libmongoc/src/mongoc/mongoc-stream-socket.h" role="src" />
- <file md5sum="ecfed477b8d8a69d3710ae5d66710b38" name="src/libmongoc/src/mongoc/mongoc-stream-tls.c" role="src" />
+ <file md5sum="9c08aac5c007feed72215c2894e80866" name="src/libmongoc/src/mongoc/mongoc-stream-tls.c" role="src" />
<file md5sum="3eea101670cf42b867d5a61597548f36" name="src/libmongoc/src/mongoc/mongoc-stream-tls.h" role="src" />
<file md5sum="66e46835120b2df99c7b0db2387dd6c3" name="src/libmongoc/src/mongoc/mongoc-stream.c" role="src" />
<file md5sum="40bdf55f52281c74e6c9c1a876e77637" name="src/libmongoc/src/mongoc/mongoc-stream.h" role="src" />
<file md5sum="b7420c8161037d2990282f9599c5c66e" name="src/libmongoc/src/mongoc/mongoc-thread-private.h" role="src" />
<file md5sum="3f6530302f233d487a44c8ce3dc45a0c" name="src/libmongoc/src/mongoc/mongoc-topology-description-private.h" role="src" />
<file md5sum="f8401a63ff80140174be13ef996d9894" name="src/libmongoc/src/mongoc/mongoc-topology-description.c" role="src" />
<file md5sum="70c41e9792dc744332b22762ba593d35" name="src/libmongoc/src/mongoc/mongoc-topology-private.h" role="src" />
<file md5sum="fa0c4c686d95e29b97f39db6e88a3c44" name="src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h" role="src" />
<file md5sum="9e451ba52b688873042abca83cbb3200" name="src/libmongoc/src/mongoc/mongoc-topology-scanner.c" role="src" />
<file md5sum="1405db311f8b7712faf08c0b2aff9b40" name="src/libmongoc/src/mongoc/mongoc-topology.c" role="src" />
<file md5sum="f8fe41c378f1b6a9c22e3a0c9195909a" name="src/libmongoc/src/mongoc/mongoc-trace.h" role="src" />
<file md5sum="f2d7142c7e850f3f242154e729ab07eb" name="src/libmongoc/src/mongoc/mongoc-uri-private.h" role="src" />
<file md5sum="51121710e2a197f518b891420a40069a" name="src/libmongoc/src/mongoc/mongoc-uri.c" role="src" />
<file md5sum="453f882020f4d0e2f618ba02a6904599" name="src/libmongoc/src/mongoc/mongoc-uri.h" role="src" />
<file md5sum="9e895e0de623c8d4618e52e6e9fec36c" name="src/libmongoc/src/mongoc/mongoc-util-private.h" role="src" />
<file md5sum="94bd0076ee62643a3f82faff1e2c1f5f" name="src/libmongoc/src/mongoc/mongoc-util.c" role="src" />
<file md5sum="e699d508bdb2d3f5220bbc5bf413bae1" name="src/libmongoc/src/mongoc/mongoc-version-functions.c" role="src" />
<file md5sum="13165cf1b16ef34ec8d72cb980705477" name="src/libmongoc/src/mongoc/mongoc-version-functions.h" role="src" />
- <file md5sum="775a67d116131c17b206fb9dca6dce1a" name="src/libmongoc/src/mongoc/mongoc-version.h" role="src" />
+ <file md5sum="2bf5ec6aff0f37d4f8cd54f55b9a0e87" name="src/libmongoc/src/mongoc/mongoc-version.h" role="src" />
<file md5sum="2f63b4b1f86910aab6a6e7423af3f7a8" name="src/libmongoc/src/mongoc/mongoc-version.h.in" role="src" />
<file md5sum="445de5fdc0a96238c91dcb0ed0066aa3" name="src/libmongoc/src/mongoc/mongoc-write-command-private.h" role="src" />
<file md5sum="af74cd67eeb47c25bf901d8eb938b555" name="src/libmongoc/src/mongoc/mongoc-write-command.c" role="src" />
<file md5sum="a85e113e3ebedb5db35c3d34ab7e7453" name="src/libmongoc/src/mongoc/mongoc-write-concern-private.h" role="src" />
<file md5sum="0c1c7aecc6c11102d7433b98a08f8f6c" name="src/libmongoc/src/mongoc/mongoc-write-concern.c" role="src" />
<file md5sum="f4d70867c1f3ef046a36e8d46a12d693" name="src/libmongoc/src/mongoc/mongoc-write-concern.h" role="src" />
<file md5sum="78ceb5e92fa9f74562553680b32ce907" name="src/libmongoc/src/mongoc/mongoc.h" role="src" />
<file md5sum="ed1890accd7d9a1426fdac121ed42ad4" name="src/libmongoc/src/mongoc/op-delete.def" role="src" />
<file md5sum="9af88adf2ef432761bbe81db2f9bdce7" name="src/libmongoc/src/mongoc/op-get-more.def" role="src" />
<file md5sum="242fff22640f143ae262e363e8552a7e" name="src/libmongoc/src/mongoc/op-header.def" role="src" />
<file md5sum="2efe34631dd0d540d0f1d2fdb2d57813" name="src/libmongoc/src/mongoc/op-insert.def" role="src" />
<file md5sum="79ab986cb49a47e7c9bccdc4005a9697" name="src/libmongoc/src/mongoc/op-kill-cursors.def" role="src" />
<file md5sum="25dd34248b0000465c7e2ac769fc509a" name="src/libmongoc/src/mongoc/op-msg.def" role="src" />
<file md5sum="a986d22cb495d652dc6059d722bb3266" name="src/libmongoc/src/mongoc/op-query.def" role="src" />
<file md5sum="dd22bb15cb70d35fe25192f0f304871b" name="src/libmongoc/src/mongoc/op-reply.def" role="src" />
<file md5sum="03c6179a4fe8b51c606b03a763529d55" name="src/libmongoc/src/mongoc/op-update.def" role="src" />
<file md5sum="94cc18fabf34abc9acbff2ec6c5293f6" name="src/libmongoc/src/mongoc/utlist.h" role="src" />
- <file md5sum="5b28ee398da148313e912a0c08d76ba4" name="src/libmongoc/VERSION_CURRENT" role="src" />
- <file md5sum="5b28ee398da148313e912a0c08d76ba4" name="src/libmongoc/VERSION_RELEASED" role="src" />
- <file md5sum="e5916ca019cf1ce41674bbe597e670fd" name="src/bson.c" role="src" />
+ <file md5sum="f82208cb1a0eac11d8d5726958ce9104" name="src/libmongoc/VERSION_CURRENT" role="src" />
+ <file md5sum="f82208cb1a0eac11d8d5726958ce9104" name="src/libmongoc/VERSION_RELEASED" role="src" />
+ <file md5sum="eac49ee20312812495efa351f7f5e866" name="src/bson.c" role="src" />
<file md5sum="bebc35732bfee1cc066e6b69179372f4" name="tests/bson/bson-binary-001.phpt" role="test" />
<file md5sum="23d700ccdf85be88ba90ade89c280e20" name="tests/bson/bson-binary_error-001.phpt" role="test" />
<file md5sum="d8bf50966d4a846980e5bb0c7e2af9ae" name="tests/bson/bson-binary_error-002.phpt" role="test" />
<file md5sum="c6edc1bcdf992161a3cb3858d46eb0e7" name="tests/bson/bson-binary_error-003.phpt" role="test" />
<file md5sum="52eeeef76dcee108b90ad4a9303fb0b4" name="tests/bson/bson-binary_error-004.phpt" role="test" />
<file md5sum="a24affdc861cf1f852132176382d3f9b" name="tests/bson/bson-decode-001.phpt" role="test" />
<file md5sum="4601ef879a00a3f5d292ce02d397ac83" name="tests/bson/bson-decode-002.phpt" role="test" />
<file md5sum="0464160c1c9d7944eb73d9d9591937c6" name="tests/bson/bson-encode-001.phpt" role="test" />
<file md5sum="809e6edcf382893ee73f8284ebedfb32" name="tests/bson/bson-encode-002.phpt" role="test" />
<file md5sum="3a9e1730a0e95c9b56d87d90cf05370d" name="tests/bson/bson-encode-003.phpt" role="test" />
<file md5sum="cecc8a8e855571287fffe7ed99c9ee43" name="tests/bson/bson-encode-004.phpt" role="test" />
<file md5sum="31e2e2bba761f0b40870344955365015" name="tests/bson/bson-encode-005.phpt" role="test" />
<file md5sum="92afbf6ebf6949ab35ff5d96dc539f8f" name="tests/bson/bson-fromJSON-001.phpt" role="test" />
<file md5sum="eec9171b4f1469e82bd77054a15bcf72" name="tests/bson/bson-fromJSON-002.phpt" role="test" />
<file md5sum="3406e7eb87f87d8d4417c30abc08dcde" name="tests/bson/bson-fromJSON_error-001.phpt" role="test" />
<file md5sum="9f55401972a1fec4e2e3e2fe51a93cda" name="tests/bson/bson-fromPHP-001.phpt" role="test" />
<file md5sum="b2c107d47a52d68f23996e347801a286" name="tests/bson/bson-fromPHP-002.phpt" role="test" />
<file md5sum="65ad004cffe9c745ccad21abaac1cc44" name="tests/bson/bson-fromPHP-003.phpt" role="test" />
<file md5sum="1b5e765a75dd2a3dc9da924ccd14533b" name="tests/bson/bson-fromPHP_error-001.phpt" role="test" />
<file md5sum="e2fc4c4382076d28ff0b73831a76e052" name="tests/bson/bson-fromPHP_error-002.phpt" role="test" />
<file md5sum="19c7f5b78a1cee1a33db608ce9cb023c" name="tests/bson/bson-fromPHP_error-003.phpt" role="test" />
<file md5sum="9bd6b7e322f81c800abd6366d52e0cce" name="tests/bson/bson-generate-document-id.phpt" role="test" />
<file md5sum="786d13fade1d06628539b0d531f7beed" name="tests/bson/bson-javascript-001.phpt" role="test" />
<file md5sum="201a4b0e0502669dd9a2f88fcb79e6d2" name="tests/bson/bson-javascript-002.phpt" role="test" />
<file md5sum="2f035a4f305d3273cc716d26637f4cf1" name="tests/bson/bson-javascript_error-001.phpt" role="test" />
<file md5sum="4f20468db5aa0493fb7f480f53a4e4be" name="tests/bson/bson-javascript_error-002.phpt" role="test" />
<file md5sum="6460ad33cd1263ccd43682a95b2b2fc7" name="tests/bson/bson-javascript_error-003.phpt" role="test" />
<file md5sum="3f90ee154574175d38dc4e5f5ec5d0cf" name="tests/bson/bson-maxkey-001.phpt" role="test" />
<file md5sum="7e7cf76daee27aae60c25fdd35ed9b7d" name="tests/bson/bson-maxkey_error-001.phpt" role="test" />
<file md5sum="ada69643cc053c53b82db805ba1e5c92" name="tests/bson/bson-maxkey_error-002.phpt" role="test" />
<file md5sum="c10d9f780bb8ba4439b034e1340d9d76" name="tests/bson/bson-minkey-001.phpt" role="test" />
<file md5sum="5d3920d3e7844c2431a9bfbb30265858" name="tests/bson/bson-minkey_error-001.phpt" role="test" />
<file md5sum="5415e6d048b5b1bd87081f85629822bb" name="tests/bson/bson-minkey_error-002.phpt" role="test" />
<file md5sum="a950b10013aea4fee6e484dfa4454677" name="tests/bson/bson-objectid-001.phpt" role="test" />
<file md5sum="13353a8dc9e4e89db641f436742a6a34" name="tests/bson/bson-objectid-002.phpt" role="test" />
<file md5sum="b1b7a0270a33a479306931636e122d0b" name="tests/bson/bson-objectid-003.phpt" role="test" />
<file md5sum="ed0953c705a45aebbc2e79c2ef8456d0" name="tests/bson/bson-objectid-004.phpt" role="test" />
<file md5sum="06e8e2ee8b9b0d7e6c14925a08560eda" name="tests/bson/bson-objectid_error-001.phpt" role="test" />
<file md5sum="12197a7a1f1da8e8d261a1175a24a991" name="tests/bson/bson-objectid_error-002.phpt" role="test" />
<file md5sum="116901311ab5a7d9b9a52af094e4e5be" name="tests/bson/bson-objectid_error-003.phpt" role="test" />
<file md5sum="1ed40d23a7d9ba716556bdba3641420c" name="tests/bson/bson-ods-001.phpt" role="test" />
<file md5sum="9fc3f2c0547cdda4ee5d962e1681dfe9" name="tests/bson/bson-ods-002.phpt" role="test" />
<file md5sum="bb2c9e6bff9ae8362b7d150f2d282cc2" name="tests/bson/bson-regex-001.phpt" role="test" />
<file md5sum="e66c17b47715dccfc3a0e2f987ce61da" name="tests/bson/bson-regex-002.phpt" role="test" />
<file md5sum="de4df90c9ee5b40559e9edfed627f9d8" name="tests/bson/bson-regex_error-001.phpt" role="test" />
<file md5sum="6e1ed89e0426347834a2b4e860dd1392" name="tests/bson/bson-regex_error-002.phpt" role="test" />
<file md5sum="650ac63699736efe694d9e62cdb49fbf" name="tests/bson/bson-regex_error-003.phpt" role="test" />
<file md5sum="f6fd1c46cf896f9982b1db26fd536cba" name="tests/bson/bson-timestamp-001.phpt" role="test" />
<file md5sum="8067d16233d25829749ad212b66e2c64" name="tests/bson/bson-timestamp-002.phpt" role="test" />
<file md5sum="1bb28cb001dd72b736edf4a08af8124d" name="tests/bson/bson-timestamp-003.phpt" role="test" />
<file md5sum="c2c0ba7c1b4808ac2bddf6df9078d4cf" name="tests/bson/bson-timestamp-004.phpt" role="test" />
<file md5sum="69e996eb6cbaaec323c3eda792b7438f" name="tests/bson/bson-timestamp_error-001.phpt" role="test" />
<file md5sum="fabc524c64400904634c839dd6d99ac3" name="tests/bson/bson-timestamp_error-002.phpt" role="test" />
<file md5sum="830b9a8a71a4f43966a9fc436a426e15" name="tests/bson/bson-timestamp_error-003.phpt" role="test" />
<file md5sum="4cc2263556b9d822b239d8360aca3686" name="tests/bson/bson-timestamp_error-004.phpt" role="test" />
<file md5sum="d5acc13abc455cc7fc4f1583c0db986b" name="tests/bson/bson-timestamp_error-005.phpt" role="test" />
<file md5sum="98f6afe81e8b17479334a1395f6ef083" name="tests/bson/bson-toJSON-001.phpt" role="test" />
<file md5sum="6fabfe78cf07809a024fa119d93ec45c" name="tests/bson/bson-toJSON-002.phpt" role="test" />
<file md5sum="de83d3c54b6a417d2743fffb052a2c3f" name="tests/bson/bson-toJSON_error-001.phpt" role="test" />
<file md5sum="cd162c003591f07a8c6c81e38a87c443" name="tests/bson/bson-toJSON_error-002.phpt" role="test" />
<file md5sum="5b03b6b33d88ce5a2f3041e29dda66d0" name="tests/bson/bson-toJSON_error-003.phpt" role="test" />
<file md5sum="77c57776452ba9bbcb5f6abbe360391f" name="tests/bson/bson-toPHP-001.phpt" role="test" />
<file md5sum="4d1e09c1b3458bb26c54b3d8ce8b11da" name="tests/bson/bson-toPHP-002.phpt" role="test" />
<file md5sum="5f9521d0dcfb6c38de8fd349f0e5f0a2" name="tests/bson/bson-toPHP-003.phpt" role="test" />
<file md5sum="5db3929a04f1a0d705dc7fe26deddf64" name="tests/bson/bson-toPHP_error-001.phpt" role="test" />
<file md5sum="6c0f49e220988f9bf9168841df4e4231" name="tests/bson/bson-toPHP_error-002.phpt" role="test" />
<file md5sum="55e1ccd504a577a2af52ffecca3ce2ce" name="tests/bson/bson-toPHP_error-003.phpt" role="test" />
<file md5sum="4dbfa92483b94dd3f526e886fbc8a5c0" name="tests/bson/bson-toPHP_error-004.phpt" role="test" />
<file md5sum="191fed9e085f5ad6b0c99fd2fff0e55d" name="tests/bson/bson-unknown-001.phpt" role="test" />
<file md5sum="99c8c7d06810f625c76f4afb00abcefd" name="tests/bson/bson-utcdatetime-001.phpt" role="test" />
<file md5sum="e8b73b470dcd27db3e067816b999b966" name="tests/bson/bson-utcdatetime-002.phpt" role="test" />
<file md5sum="112dc5b0911c4e85b97f59be7d97f1d7" name="tests/bson/bson-utcdatetime-003.phpt" role="test" />
<file md5sum="9387ecc4d96639e275e4798e7ea577a1" name="tests/bson/bson-utcdatetime-int-size.phpt" role="test" />
<file md5sum="c351628e8162ba357d2c8149b3742765" name="tests/bson/bson-utcdatetime-todatetime-001.phpt" role="test" />
<file md5sum="e1196daddbe4dbb675ccf1662b8f5b79" name="tests/bson/bson-utcdatetime-tostring-001.phpt" role="test" />
<file md5sum="edef347cbb01369c592ef199e7ff00bf" name="tests/bson/bson-utcdatetime_error-001.phpt" role="test" />
<file md5sum="2d1fd5c8766539563d9ed65f6026341b" name="tests/bson/bson-utcdatetime_error-002.phpt" role="test" />
<file md5sum="1cc72ac75008b602572e9f7933e89dab" name="tests/bson/bson-utcdatetime_error-003.phpt" role="test" />
<file md5sum="cf9a63f20ee1f04a2fadb6a01ea698db" name="tests/bson/bug0274.phpt" role="test" />
<file md5sum="3b098061a8551c3f854cffea73f2d05f" name="tests/bson/bug0325.phpt" role="test" />
<file md5sum="5b9d36885e7a3701f1f54ae92fd81ff9" name="tests/bson/bug0334-001.phpt" role="test" />
<file md5sum="c4f2ea95fb457c338e2c53f25c2ef32c" name="tests/bson/bug0334-002.phpt" role="test" />
<file md5sum="53a43be600eea2408ee6a418b50f5374" name="tests/bson/bug0341.phpt" role="test" />
<file md5sum="57242d53c1e3eba449230809e66b861f" name="tests/bson/bug0347.phpt" role="test" />
<file md5sum="34f057d3c3d9914d5fb99db8f2e9084c" name="tests/bson/bug0528.phpt" role="test" />
<file md5sum="1ff63df4abb636b747ff1f158b263c51" name="tests/bson/bug0531.phpt" role="test" />
<file md5sum="7e55e6205a865e2b38f8da98bcf1132a" name="tests/bson/bug0544.phpt" role="test" />
<file md5sum="646dfb69fd870a96836d097a24c90c5a" name="tests/bson/bug0592.phpt" role="test" />
<file md5sum="cac9dbce8b05d299fa94eee8cfeb467a" name="tests/bson/bug0623.phpt" role="test" />
<file md5sum="1eea1b95c48b6927aff3e6dfdc3ddb11" name="tests/bson/typemap-001.phpt" role="test" />
<file md5sum="3b3925e0fc24c6be84e30606185bd201" name="tests/bson/typemap-002.phpt" role="test" />
+ <file md5sum="4b1d59d2f1959529457cc64e7688633b" name="tests/bulk/bug0667.phpt" role="test" />
<file md5sum="1244168b0f4b7365477d8ac32538af07" name="tests/bulk/bulkwrite-delete-001.phpt" role="test" />
<file md5sum="5d0cb4c56dccbc04d31ac087866d5b52" name="tests/bulk/bulkwrite-insert-001.phpt" role="test" />
<file md5sum="2e0c9088f8c8aca72678019d37264bd6" name="tests/bulk/bulkwrite-update-001.phpt" role="test" />
<file md5sum="a233f765076b0f5514bb3c3b23ebf24e" name="tests/bulk/bulkwrite_error-001.phpt" role="test" />
<file md5sum="568f77c1df53baa3cf023cb59b98fd5d" name="tests/bulk/write-0001.phpt" role="test" />
<file md5sum="fab2e6f0df6dcefc442552e59a3dc5c2" name="tests/bulk/write-0002.phpt" role="test" />
<file md5sum="6ccad81ea741ac239e5189ac35914cab" name="tests/bulk/write-0003.phpt" role="test" />
<file md5sum="02e74cf0ff0e2240901dfe918d6cbeab" name="tests/connect/replicaset-seedlist-001.phpt" role="test" />
<file md5sum="60392dab08a5778d885aac6984bc4a5a" name="tests/connect/replicaset-seedlist-002.phpt" role="test" />
<file md5sum="5782cb975ced7a0d028d9f8c36cfffc4" name="tests/connect/standalone-auth-0001.phpt" role="test" />
<file md5sum="13b4c81631c4fe5b2826b3943b65d481" name="tests/connect/standalone-auth-0002.phpt" role="test" />
<file md5sum="d31ed516811f559e1f9ecd9a557fd0be" name="tests/connect/standalone-plain-0001.phpt" role="test" />
<file md5sum="e8f9688845ac3a1b8f5da6b3d056f2f1" name="tests/connect/standalone-plain-0002.phpt" role="test" />
<file md5sum="a39ac1f4f670cc6f48cbba0e6caf79bf" name="tests/connect/standalone-ssl-0001.phpt" role="test" />
<file md5sum="348c6609676853409a355b5aa7ff7a87" name="tests/connect/standalone-ssl-0002.phpt" role="test" />
<file md5sum="2235e8264cb413b5ffee7da73c70d181" name="tests/connect/standalone-ssl-0003.phpt" role="test" />
<file md5sum="642d62586a60c60e24959f6581f55f5b" name="tests/connect/standalone-ssl-0004.phpt" role="test" />
<file md5sum="14fd196ca9fd966fa83bd7c6b9971d9d" name="tests/connect/standalone-ssl-0005.phpt" role="test" />
<file md5sum="12a9fc685f801ce67bcc408c127a4dc5" name="tests/connect/standalone-ssl-0006.phpt" role="test" />
<file md5sum="3cfa10a59158131a88a0b39b7a0577c5" name="tests/connect/standalone-x509-0001.phpt" role="test" />
<file md5sum="01e1156966566719e490c119bc878d8d" name="tests/connect/standalone-x509-0002.phpt" role="test" />
<file md5sum="9be2eb34d07c21b3503f94d505ee6721" name="tests/connect/standalone-x509-0003.phpt" role="test" />
<file md5sum="734f08cb6bfb53b294114690ea37c84d" name="tests/connect/standalone-x509-0004.phpt" role="test" />
<file md5sum="32b7b683d5f6ab0aa1c0fad10b8b4c83" name="tests/connect/standalone-x509-error-0001.phpt" role="test" />
<file md5sum="dea3f769b6ea7a7cb6f4ff15ed072059" name="tests/functional/cursor-001.phpt" role="test" />
<file md5sum="47be0591e6e7506e859fac86494d7b29" name="tests/functional/cursorid-001.phpt" role="test" />
<file md5sum="6b4b2c27fb5fd3a59af12b30ad7e875c" name="tests/functional/phpinfo-1.phpt" role="test" />
<file md5sum="b65a28921bbe4a801dc43c8f3d1614f2" name="tests/functional/phpinfo-2.phpt" role="test" />
<file md5sum="2a66545653e7035f281c701a4a5bfa1f" name="tests/functional/query-sort-001.phpt" role="test" />
<file md5sum="ee0ff92d6d48e5c624e7043cc4728a0c" name="tests/functional/query-sort-002.phpt" role="test" />
<file md5sum="7809f48bb822f2d795d7148341852af9" name="tests/functional/query-sort-003.phpt" role="test" />
<file md5sum="9eb7c7567ae8585fed03b76a5b857c42" name="tests/functional/query-sort-004.phpt" role="test" />
<file md5sum="cd9ebc6251e4ae369a27f1baeeeb20a8" name="tests/manager/manager-ctor-001.phpt" role="test" />
<file md5sum="2739447256d9292f60da18e978a19919" name="tests/manager/manager-ctor-002.phpt" role="test" />
<file md5sum="52e2a1bf042ed7a89a51e19e16a035c8" name="tests/manager/manager-ctor_error-001.phpt" role="test" />
<file md5sum="097406cf2525d804cef1d0b9630c3821" name="tests/manager/manager-ctor_error-002.phpt" role="test" />
<file md5sum="1fc3fc1f16f3845176760797cc34e061" name="tests/manager/manager-ctor_error-003.phpt" role="test" />
<file md5sum="ec2dc47bad99221bbb91caada48545fb" name="tests/manager/manager-ctor_error-004.phpt" role="test" />
<file md5sum="2314fdd5b4bc565ea9e05616994f361f" name="tests/manager/manager-debug-001.phpt" role="test" />
<file md5sum="510484a4463fc51f247a94e1fb872e60" name="tests/manager/manager-debug-002.phpt" role="test" />
<file md5sum="68d4a2e5f42415a1fade5d27e7c5723d" name="tests/manager/manager-debug-003.phpt" role="test" />
<file md5sum="0f8db6f664bc5cd5169365314e029598" name="tests/manager/manager-destruct-001.phpt" role="test" />
<file md5sum="eb865c94e36cb45d30deaa1fef6f6b61" name="tests/manager/manager-executeBulkWrite-001.phpt" role="test" />
<file md5sum="8699029df0d1c55416ff2e9b84f29de7" name="tests/manager/manager-executeBulkWrite-002.phpt" role="test" />
<file md5sum="e026dd6019cc223d720831cc2477f9ad" name="tests/manager/manager-executeBulkWrite-003.phpt" role="test" />
<file md5sum="5573209b66cbce19a2261b154a8965fc" name="tests/manager/manager-executeBulkWrite-004.phpt" role="test" />
<file md5sum="369baa6800666052fcd234bca4d6d212" name="tests/manager/manager-executeBulkWrite-005.phpt" role="test" />
<file md5sum="0ae8e3f91a0281b349ccbbf5a6d38645" name="tests/manager/manager-executeBulkWrite-006.phpt" role="test" />
<file md5sum="27b857c44e4cb8038de7783fefb75dbe" name="tests/manager/manager-executeBulkWrite-007.phpt" role="test" />
<file md5sum="94c563468ea9ca945cccfd489a8a569e" name="tests/manager/manager-executeBulkWrite-008.phpt" role="test" />
<file md5sum="d9b09740e5c0dfc266a730d9a15dfc5b" name="tests/manager/manager-executeBulkWrite-009.phpt" role="test" />
<file md5sum="f110b2740f1e1f63b4d922af824098b7" name="tests/manager/manager-executeBulkWrite-010.phpt" role="test" />
- <file md5sum="9e0252fc5cc58705b1e3027d70e61f65" name="tests/manager/manager-executeBulkWrite-011.phpt" role="test" />
- <file md5sum="5dea74e1eabc9109ab8ed5f83b2898ff" name="tests/manager/manager-executeBulkWrite_error-001.phpt" role="test" />
- <file md5sum="1168466335c06c357bf89d7e3a954445" name="tests/manager/manager-executeBulkWrite_error-002.phpt" role="test" />
- <file md5sum="8dde2901be06f99f4d63cf793ebd50c7" name="tests/manager/manager-executeBulkWrite_error-003.phpt" role="test" />
- <file md5sum="c417d55fa8d1d59989027fbfb7aa787f" name="tests/manager/manager-executeBulkWrite_error-004.phpt" role="test" />
- <file md5sum="b8cc1e8bc50959dd274398b92f544bf5" name="tests/manager/manager-executeBulkWrite_error-005.phpt" role="test" />
- <file md5sum="3e232bceb2a8b0d56bffa4d623b785c8" name="tests/manager/manager-executeBulkWrite_error-006.phpt" role="test" />
+ <file md5sum="ab6d6d06179fd4da9a9b95d512dd723e" name="tests/manager/manager-executeBulkWrite-011.phpt" role="test" />
+ <file md5sum="a29b35dc6a803499d584e7d6efe620aa" name="tests/manager/manager-executeBulkWrite_error-001.phpt" role="test" />
+ <file md5sum="72422952716c0fc6c6ee34c028ab746b" name="tests/manager/manager-executeBulkWrite_error-002.phpt" role="test" />
+ <file md5sum="a99efdb13d47c79a465dc890ace6b2e9" name="tests/manager/manager-executeBulkWrite_error-003.phpt" role="test" />
+ <file md5sum="79bebde9c592b8eaeffe0d3db98fc4b2" name="tests/manager/manager-executeBulkWrite_error-004.phpt" role="test" />
+ <file md5sum="f436f057342ae3112e8295ddbf8b1fc8" name="tests/manager/manager-executeBulkWrite_error-005.phpt" role="test" />
+ <file md5sum="98ae436fcabb824568b72b17cf9280d1" name="tests/manager/manager-executeBulkWrite_error-006.phpt" role="test" />
<file md5sum="3ca165fe1caa28e3529076dee443a4bc" name="tests/manager/manager-executeBulkWrite_error-007.phpt" role="test" />
<file md5sum="a89e534345a596263e6bbfe924a82f90" name="tests/manager/manager-executeCommand-001.phpt" role="test" />
<file md5sum="966e7e469ea0c9bf2f02c51d470cdf2f" name="tests/manager/manager-executeCommand_error-001.phpt" role="test" />
<file md5sum="b91fd7fac176c4f86d557f38e2d5b321" name="tests/manager/manager-executeQuery-001.phpt" role="test" />
<file md5sum="dfcba1862c4bfd21780696531d9ad995" name="tests/manager/manager-executeQuery-002.phpt" role="test" />
<file md5sum="b9fb3a1425e783bada38e4dc1e8357b0" name="tests/manager/manager-executeQuery-005.phpt" role="test" />
<file md5sum="93732d64e31d28ec551fb4dbcd39ebdb" name="tests/manager/manager-executeQuery_error-001.phpt" role="test" />
<file md5sum="59fc1f8755cee6001ff7e7cf4ec7b545" name="tests/manager/manager-executequery-without-assignment.phpt" role="test" />
<file md5sum="eeef0ff2e03efbfc53ed7752ac21b015" name="tests/manager/manager-getreadconcern-001.phpt" role="test" />
<file md5sum="311a1b98e6ec0983bdaaa71d1b3ac12a" name="tests/manager/manager-getreadpreference-001.phpt" role="test" />
<file md5sum="984a06de0d8857e1df125babdfac1fef" name="tests/manager/manager-getservers-001.phpt" role="test" />
<file md5sum="99314dc63ca0a4abc49e5a56dc2c6025" name="tests/manager/manager-getservers-002.phpt" role="test" />
<file md5sum="b9f7e97b6e68277a4877995fff51e647" name="tests/manager/manager-getwriteconcern-001.phpt" role="test" />
<file md5sum="f55b83dec74f5c379cf719423abdd703" name="tests/manager/manager-invalidnamespace.phpt" role="test" />
<file md5sum="d6958dfe7978d07cb51fc4d81c86b1e9" name="tests/manager/manager-selectserver-001.phpt" role="test" />
<file md5sum="1a2ce27f55ec7a8c7b7145715d9e70a4" name="tests/manager/manager-selectserver_error-001.phpt" role="test" />
<file md5sum="1b44b8daec032ca66d24b26f3a43f1ee" name="tests/manager/manager-set-uri-options-001.phpt" role="test" />
<file md5sum="31098091db5117a73880a689d1b22a69" name="tests/manager/manager-set-uri-options-002.phpt" role="test" />
<file md5sum="5b5c4beab3345ca7631238ce1f8f11e1" name="tests/manager/manager-var-dump-001.phpt" role="test" />
<file md5sum="34f2067a0a6c77bb0d5d928baf93e639" name="tests/manager/manager-wakeup.phpt" role="test" />
<file md5sum="1830697c88561639d0cdb6aaa48b9619" name="tests/manager/manager_error-001.phpt" role="test" />
<file md5sum="bf41b7f6435243e4bfef99d526451025" name="tests/readPreference/bug0146-001.phpt" role="test" />
<file md5sum="dae94f754c0d42d839bf97238d8b0910" name="tests/readPreference/bug0146-002.phpt" role="test" />
<file md5sum="a319543f45cd0d04a2aad1eb67000f61" name="tests/readPreference/readpreference-ctor-001.phpt" role="test" />
<file md5sum="e0509842811f6372fb751e61330db4e9" name="tests/readPreference/readpreference-ctor_error-001.phpt" role="test" />
<file md5sum="e8b32dbdd507c31820def47a24a44080" name="tests/readPreference/readpreference-getMode-001.phpt" role="test" />
<file md5sum="4d991b10065eba468053506b77820aeb" name="tests/readPreference/readpreference-getTagSets-001.phpt" role="test" />
<file md5sum="0ab14ccac9890454dd0536f32d23ed7b" name="tests/readPreference/readpreference_error-001.phpt" role="test" />
<file md5sum="75a4ec8e23ef050d7057e855fff2f5f6" name="tests/server/server-constants.phpt" role="test" />
<file md5sum="4661126e8b4887192c5b4cbb3687021e" name="tests/server/server-construct-001.phpt" role="test" />
<file md5sum="f431e28728e94946f296a489ca4ee5a4" name="tests/server/server-debug.phpt" role="test" />
<file md5sum="d38a111b8fe29155d2e5d25072907dda" name="tests/server/server-errors.phpt" role="test" />
<file md5sum="d394fde992b6bbfd89d732f217806529" name="tests/server/server-executeBulkWrite-001.phpt" role="test" />
<file md5sum="34116ca1ab4ad524bfd7f79838ea8703" name="tests/server/server-executeBulkWrite-002.phpt" role="test" />
<file md5sum="87771b6bfe5910d05c45d5d6152cfbda" name="tests/server/server-executeBulkWrite-003.phpt" role="test" />
<file md5sum="42f4e11675da0b4e7d42c90f95571152" name="tests/server/server-executeBulkWrite-004.phpt" role="test" />
<file md5sum="114b77fc8d26158df96b5c3820142cc5" name="tests/server/server-executeBulkWrite-005.phpt" role="test" />
<file md5sum="570c2f8eee8d401eb38c830a514bcde0" name="tests/server/server-executeCommand-001.phpt" role="test" />
<file md5sum="5fc4aeaa34980a55ddc0ea073061a9e5" name="tests/server/server-executeCommand-002.phpt" role="test" />
<file md5sum="4b9fb5c82943288d5155129327f3299f" name="tests/server/server-executeCommand_error-001.phpt" role="test" />
<file md5sum="f2e023f40ea3af5b1fd4b555948e7143" name="tests/server/server-executeQuery-001.phpt" role="test" />
<file md5sum="4fb14745659a9389c1a483d7edf2b93c" name="tests/server/server-executeQuery-002.phpt" role="test" />
<file md5sum="e5cb7df3413213e2d2cfb2d3e0339d37" name="tests/server/server-executeQuery-003.phpt" role="test" />
<file md5sum="044898026d584ad685adefecf4910147" name="tests/server/server-executeQuery-004.phpt" role="test" />
<file md5sum="fda7a9c2ff6107719b84e4e7e2708367" name="tests/server/server-executeQuery-005.phpt" role="test" />
<file md5sum="986bca1a493fdaa71f346eb168f8266e" name="tests/server/server-executeQuery-006.phpt" role="test" />
<file md5sum="de82332ab4df59fa7dd07b9a8be1039f" name="tests/server/server-executeQuery-007.phpt" role="test" />
<file md5sum="f2e3d061825cd2bbed68de882d4c6bd8" name="tests/server/server-executeQuery_error-001.phpt" role="test" />
<file md5sum="bfd2dc69cd004efbb2c4e2a683287027" name="tests/server/server_error-001.phpt" role="test" />
<file md5sum="ef31e8b9f59a396d435badf3c9a653c3" name="tests/standalone/bug0159.phpt" role="test" />
<file md5sum="3ff56796c1e87ea6a07ae574ea64aaf4" name="tests/standalone/bug0166.phpt" role="test" />
<file md5sum="87bb7dffe9a182e72322a74ffcbf7cb6" name="tests/standalone/bug0231.phpt" role="test" />
<file md5sum="508f7f23c5b80875cf8893f11fd636b0" name="tests/standalone/bug0357.phpt" role="test" />
<file md5sum="5cac284a2bc03ef77ec8bea7de101bf1" name="tests/standalone/bug0487-001.phpt" role="test" />
<file md5sum="4e577fce830f9c4c09839f04758604ca" name="tests/standalone/bug0487-002.phpt" role="test" />
<file md5sum="907e0dfcdf61c30b9559a3a17bd2bfd7" name="tests/standalone/bug0545.phpt" role="test" />
+ <file md5sum="6f8d0442d1e5cbd780a051a8372277ff" name="tests/standalone/bug0655.phpt" role="test" />
<file md5sum="727192fdd6f1dc71751a2831b0603583" name="tests/standalone/connectiontimeoutexception-001.phpt" role="test" />
<file md5sum="d1b6e3057856667e03b515c117cc6e01" name="tests/standalone/executiontimeoutexception-001.phpt" role="test" />
<file md5sum="18a8835a80982d575d574ef50c40a383" name="tests/standalone/executiontimeoutexception-002.phpt" role="test" />
<file md5sum="6708621c6c2c09bc2f261dc92c965bf9" name="tests/standalone/manager-as-singleton.phpt" role="test" />
<file md5sum="6bc5f1fba6c3ad151704fd8500d50183" name="tests/standalone/query-errors.phpt" role="test" />
<file md5sum="e199482514ae20307a7bd8125fefbf75" name="tests/standalone/update-multi-001.phpt" role="test" />
<file md5sum="18fb1fcde459435fd68d2f240b0c650c" name="tests/standalone/write-error-001.phpt" role="test" />
<file md5sum="18302e344fdb4f636d9d45dacb601337" name="tests/standalone/writeresult-isacknowledged-001.phpt" role="test" />
<file md5sum="95ef690936a92a3bb4df2797516c0198" name="tests/standalone/writeresult-isacknowledged-002.phpt" role="test" />
<file md5sum="f8a5301f0742b61a427521685cd02677" name="tests/standalone/writeresult-isacknowledged-003.phpt" role="test" />
<file md5sum="59adebd29ef983f00c4d55cfc4b2d10d" name="tests/utils/PHONGO-FIXTURES.json.gz" role="test" />
<file md5sum="8eb155fe0ba18304305ec5e7095ac938" name="tests/utils/basic-skipif.inc" role="test" />
<file md5sum="91f09af43e3763fce276c98db4f0378c" name="tests/utils/basic.inc" role="test" />
<file md5sum="e56764b93eec80768bab873e5bfd383a" name="tests/utils/classes.inc" role="test" />
<file md5sum="f2a9dacd7fb16bb525f88444447d5dcc" name="tests/utils/tools.php" role="test" />
<file md5sum="364b6092a91f4bf8761fc554aa8062cb" name="tests/writeConcern/writeconcern-constants.phpt" role="test" />
<file md5sum="defadce8161c38d99237f581358e6d96" name="tests/writeConcern/writeconcern-ctor-001.phpt" role="test" />
<file md5sum="9d8a5d5fbb5180c1e1a73b4885f256fd" name="tests/writeConcern/writeconcern-ctor_error-001.phpt" role="test" />
<file md5sum="46a1f16b20000db3726900b4f80945eb" name="tests/writeConcern/writeconcern-ctor_error-002.phpt" role="test" />
<file md5sum="56e3baaa054aadf32901781a09d330e1" name="tests/writeConcern/writeconcern-ctor_error-003.phpt" role="test" />
<file md5sum="9ca99acf66a4972b548678347236c25f" name="tests/writeConcern/writeconcern-ctor_error-004.phpt" role="test" />
<file md5sum="39969dc8700891be79d6ef6ca630f867" name="tests/writeConcern/writeconcern-ctor_error-005.phpt" role="test" />
<file md5sum="1d863ece698c49dff7b3cbf254e21a2a" name="tests/writeConcern/writeconcern-debug-001.phpt" role="test" />
<file md5sum="62ae7ce0a7f173df20339fb043ed9ffa" name="tests/writeConcern/writeconcern-debug-002.phpt" role="test" />
<file md5sum="afc708c9f9d830d1c3b7cf60333f1fce" name="tests/writeConcern/writeconcern-getjournal-001.phpt" role="test" />
<file md5sum="d4c305c451a28b591db0160e9f851ee5" name="tests/writeConcern/writeconcern-getw-001.phpt" role="test" />
<file md5sum="ddb88acb62b9b89316f92e3bb6076a48" name="tests/writeConcern/writeconcern-getwtimeout-001.phpt" role="test" />
<file md5sum="9da2df0606c2dd99631ea3cf32ac1b76" name="tests/writeConcern/writeconcern_error-001.phpt" role="test" />
<file md5sum="e9f9796cf151e0a08d9e7616786e445b" name="win32/bson-config.h" role="src" />
<file md5sum="ea43ce70051fcdebc2c4435ff30d540c" name="win32/bson-version.h" role="src" />
<file md5sum="a48e0f7388bbb65ea5be67c0a4b95d26" name="win32/mongoc-config.h" role="src" />
<file md5sum="da90315b6d70e48f4b940bd80ac63abe" name="win32/mongoc-version.h" role="src" />
- <file md5sum="2efe595b9c19d02c4ce7c399b30a136f" name="ChangeLog" role="doc" />
+ <file md5sum="9c35dbc3da8181cd52260763ea2cbf4d" name="ChangeLog" role="doc" />
<file md5sum="b1e01b26bacfc2232046c90a330332b3" name="LICENSE" role="doc" />
<file md5sum="50befdabfe1b59ff8c7d8f20d0545c76" name="Makefile.frag" role="src" />
<file md5sum="324f4d69acdeb1132691a570731e58a2" name="README.md" role="doc" />
<file md5sum="f99c580b04875fa6d39a302ad8110ebd" name="RELEASE-0" role="doc" />
<file md5sum="f28b9c1fe3faa9766fe6ee5b270383fe" name="RELEASE-1.0" role="doc" />
- <file md5sum="5b7aeac85cf84bec0c74125febadf987" name="RELEASE-1.1" role="doc" />
- <file md5sum="bc4fad963e4c574c74eb2b96c9625597" name="RELEASE-1.1.5" role="doc" />
+ <file md5sum="657b70b29de156dd0ffe75341991f669" name="RELEASE-1.1" role="doc" />
+ <file md5sum="9f6b043039cdf468ddba0ee439c60f81" name="RELEASE-1.1.6" role="doc" />
<file md5sum="48106c87af23e2f8315083e03a16c384" name="Vagrantfile" role="test" />
- <file md5sum="7d10171fcd7bc68038a7b2bb70f853f7" name="config.m4" role="src" />
+ <file md5sum="4e3a2c82048a73ebbe405ba48f8e47a6" name="config.m4" role="src" />
<file md5sum="ab2aa8a04de2170cf9e944a1f06fb72a" name="config.w32" role="src" />
<file md5sum="aeb8c31ab116ae252b090fee87f8cdba" name="phongo_compat.c" role="src" />
<file md5sum="3582a1be35c01ca226a1ccc3e1abaf73" name="phongo_compat.h" role="src" />
<file md5sum="b35b14747f567a666fbd79f1e242ce78" name="php_bson.h" role="src" />
- <file md5sum="3ef7aed646545463c127a66309a787d6" name="php_phongo.c" role="src" />
- <file md5sum="fc4a4b4b9df117ff6d9bc8ff5703d37c" name="php_phongo.h" role="src" />
+ <file md5sum="d42852c17b71d2283f1c6b2de929e6c3" name="php_phongo.c" role="src" />
+ <file md5sum="285d54cb62a8a8d0200f19f5d4acd78e" name="php_phongo.h" role="src" />
<file md5sum="e370a81ff5e75e093fa2136cfa14ac96" name="php_phongo_classes.h" role="src" />
- <file md5sum="2d2094a036d2dc2102980f05a4d5ecce" name="php_phongo_structs-5.h" role="src" />
- <file md5sum="34b6f29080d826fa8f3bac1f8a8a7161" name="php_phongo_structs-7.h" role="src" />
+ <file md5sum="10a1a83238b0fc9873b952cb0dc6283a" name="php_phongo_structs-5.h" role="src" />
+ <file md5sum="1bddc7e831d2347571a54775d798d526" name="php_phongo_structs-7.h" role="src" />
</dir>
</contents>
<dependencies>
<required>
<php>
<min>5.4.0</min>
<max>7.99.99</max>
</php>
<pearinstaller>
<min>1.4.8</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>mongodb</providesextension>
<extsrcrelease />
</package>

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jun 12, 12:53 PM (3 w, 1 d ago)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
8e/dc/762541cf97cddf72675cb7f34024
Default Alt Text
(1 MB)

Event Timeline