Skip to content

report libraries runtime versions #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

report libraries runtime versions #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39303e5
report libraries runtime version
remicollet Sep 11, 2015
50662f9
Adapt for rc0
remicollet Oct 4, 2015
2548acf
can use system libbson or/and libmongoc
remicollet Oct 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ PHP_ARG_WITH(libbson, Use system libbson,
fi
PHP_EVAL_INCLINE($LIBBSON_INC)
PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBBSON, 1, [Use system libbson])
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
Expand All @@ -331,21 +332,22 @@ PHP_ARG_WITH(libmongoc, Use system libmongoc,
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.1.5; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.2.0; 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.1.6)
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.2.0)
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_LIBMONGOC, 1, [Use system libmongoc])
else
CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE"

Expand Down
11 changes: 11 additions & 0 deletions php_phongo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,8 +2375,19 @@ PHP_MINFO_FUNCTION(mongodb)
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_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_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();
Expand Down
2 changes: 1 addition & 1 deletion src/libbson
Open in desktop
Submodule libbson updated 33 files
+0 −259 .mci.yml
+1 −16 CMakeLists.txt
+0 −57 NEWS
+2 −2 README.md
+1 −12 build/autotools/CheckAtomics.m4
+0 −2 build/autotools/versions.ldscript
+2 −5 build/rpm/libbson.spec
+1 −1 doc/bson_json_reader_new_from_fd.page
+2 −2 doc/bson_oid_t.page
+2 −2 doc/bson_reader_new_from_fd.page
+1 −1 doc/bson_string_append.page
+1 −1 doc/bson_string_append_unichar.page
+1 −1 doc/bson_string_t.page
+1 −1 doc/bson_uint32_to_string.page
+1 −1 doc/bson_zero_free.page
+1 −1 doc/creating.page
+5 −5 doc/installing.page
+3 −6 doc/mallard2man.py
+0 −1 src/bson/bson-atomic.c
+31 −27 src/bson/bson-atomic.h
+1 −9 src/bson/bson-config.h.in
+1 −0 src/bson/bson-endian.h
+1 −1 src/bson/bson-iter.c
+1 −1 src/bson/bson-json.c
+3 −3 src/bson/bson-string.c
+1 −1 src/bson/bson-thread-private.h
+1 −16 src/bson/bson-utf8.c
+6 −14 src/bson/bson.c
+0 −2 src/libbson.symbols
+2 −4 tests/Makefile.am
+0 −2 tests/json/test.json
+5 −96 tests/test-json.c
+0 −34 tests/test-utf8.c
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 464 files