Skip to content

Commit be630dc

Browse files
authored
PHPC-479: Print library version for libmongoc, libbson, and libmongocrypt (#1153)
1 parent c81330c commit be630dc

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

config.m4

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ if test "$PHP_MONGODB" != "no"; then
216216
PHP_MONGODB_SYSTEM_LIBS="yes"
217217
fi
218218

219+
PHP_MONGODB_BSON_VERSION_STRING="None"
220+
PHP_MONGODB_MONGOC_VERSION_STRING="None"
221+
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
222+
219223
if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
220224
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
221225
AC_MSG_CHECKING(for libbson)
@@ -224,6 +228,7 @@ if test "$PHP_MONGODB" != "no"; then
224228
PHP_MONGODB_BSON_CFLAGS=`$PKG_CONFIG libbson-1.0 --cflags`
225229
PHP_MONGODB_BSON_LIBS=`$PKG_CONFIG libbson-1.0 --libs`
226230
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
231+
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
227232
AC_MSG_RESULT(version $PHP_MONGODB_BSON_VERSION found)
228233
else
229234
AC_MSG_ERROR(system libbson must be upgraded to version >= 1.17.0)
@@ -241,6 +246,7 @@ if test "$PHP_MONGODB" != "no"; then
241246
PHP_MONGODB_MONGOC_CFLAGS=`$PKG_CONFIG libmongoc-1.0 --cflags`
242247
PHP_MONGODB_MONGOC_LIBS=`$PKG_CONFIG libmongoc-1.0 --libs`
243248
PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG libmongoc-1.0 --modversion`
249+
PHP_MONGODB_MONGOC_VERSION_STRING="System ($PHP_MONGODB_MONGOC_VERSION)"
244250
AC_MSG_RESULT(version $PHP_MONGODB_MONGOC_VERSION found)
245251
else
246252
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.17.0)
@@ -260,6 +266,7 @@ if test "$PHP_MONGODB" != "no"; then
260266
PHP_MONGODB_MONGOCRYPT_CFLAGS=`$PKG_CONFIG libmongocrypt --cflags`
261267
PHP_MONGODB_MONGOCRYPT_LIBS=`$PKG_CONFIG libmongocrypt --libs`
262268
PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
269+
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)"
263270
AC_MSG_RESULT(version $PHP_MONGODB_MONGOCRYPT_VERSION found)
264271

265272
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS"
@@ -330,6 +337,10 @@ if test "$PHP_MONGODB" != "no"; then
330337
_include([scripts/autotools/libmongocrypt/CheckSSL.m4])
331338
_include([scripts/autotools/libmongocrypt/Version.m4])
332339

340+
PHP_MONGODB_BSON_VERSION_STRING="Bundled ($BSON_VERSION)"
341+
PHP_MONGODB_MONGOC_VERSION_STRING="Bundled ($MONGOC_VERSION)"
342+
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="Bundled ($MONGOCRYPT_BUILD_VERSION)"
343+
333344
m4_popdef([_include])
334345

335346
AC_SUBST(BSON_EXTRA_ALIGN, 0)
@@ -500,9 +511,9 @@ Build configuration:
500511
Extra CFLAGS : $STD_CFLAGS $EXTRA_CFLAGS
501512
Developers flags (slow) : $MAINTAINER_CFLAGS
502513
Code Coverage flags (extra slow) : $COVERAGE_CFLAGS
503-
System libmongoc : $PHP_MONGODB_SYSTEM_LIBS
504-
System libbson : $PHP_MONGODB_SYSTEM_LIBS
505-
System libmongocrypt : $PHP_MONGODB_SYSTEM_LIBS
514+
libmongoc : $PHP_MONGODB_BSON_VERSION_STRING
515+
libbson : $PHP_MONGODB_MONGOC_VERSION_STRING
516+
libmongocrypt : $PHP_MONGODB_MONGOCRYPT_VERSION_STRING
506517
LDFLAGS : $LDFLAGS
507518
EXTRA_LDFLAGS : $EXTRA_LDFLAGS
508519
MONGODB_SHARED_LIBADD : $MONGODB_SHARED_LIBADD

0 commit comments

Comments
 (0)