Skip to content

Commit c2065c5

Browse files
jmikolajmikola
committed
Merge pull request #494 
2 parents 5d063b6 + c7a1075 commit c2065c5

File tree

2 files changed

+24
-49
lines changed

2 files changed

+24
-49
lines changed

‎config.m4

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ if test "$MONGODB" != "no"; then
136136

137137
MAINTAINER_CFLAGS="-Wextra $_MAINTAINER_CFLAGS -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-missing-field-initializers"
138138
STD_CFLAGS="-g -O0 -Wall"
139-
dnl EXTRA_LDFLAGS="-Wl,--no-undefined"
140139
fi
141140

142141

@@ -342,10 +341,16 @@ if test "$MONGODB" != "no"; then
342341
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
343342
fi
344343

345-
PHP_ARG_WITH(libbson, whether to use system libbson,
346-
[ --with-libbson Use system libbson], no, no)
344+
PHP_ARG_WITH(libbson, whether to use system libbson,
345+
[ --with-libbson Use system libbson], no, no)
346+
PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
347+
[ --with-libmongoc Use system libmongoc], no, no)
347348

348349
if test "$PHP_LIBBSON" != "no"; then
350+
if test "$PHP_LIBMONGOC" == "no"; then
351+
AC_MSG_ERROR(Cannot use system libbson and bundled libmongoc)
352+
fi
353+
349354
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
350355
AC_MSG_CHECKING(for libbson)
351356
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
@@ -364,20 +369,20 @@ PHP_ARG_WITH(libbson, whether to use system libbson,
364369
PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
365370
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
366371
else
367-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
368-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
372+
LIBBSON_CFLAGS="-DBSON_COMPILATION"
373+
374+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS $LIBBSON_CFLAGS], shared_objects_mongodb, yes)
375+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS $LIBBSON_CFLAGS], shared_objects_mongodb, yes)
369376
fi
370377

371-
dnl libmongoc stuff {{{
372378
AC_MSG_CHECKING(configuring libmongoc)
373379
AC_MSG_RESULT(...)
374380

375-
PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
376-
[ --with-libmongoc Use system libmongoc], no, no)
377-
378-
AC_DEFINE(HAVE_MONGOC, 1, [Kinda useless extension without it..])
379-
380381
if test "$PHP_LIBMONGOC" != "no"; then
382+
if test "$PHP_LIBBSON" == "no"; then
383+
AC_MSG_ERROR(Cannot use system libmongoc and bundled libbson)
384+
fi
385+
381386
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
382387
AC_MSG_CHECKING(for libmongoc)
383388
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
@@ -397,15 +402,15 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
397402
PHP_EVAL_LIBLINE($LIBMONGOC_LIB, MONGODB_SHARED_LIBADD)
398403
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
399404
else
400-
CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE"
405+
LIBMONGOC_CFLAGS="-DMONGOC_COMPILATION -DMONGOC_TRACE"
401406

402-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
403-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_CRYPTO, [$STD_CFLAGS], shared_objects_mongodb, yes)
404-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
405-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_OPENSSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
406-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_TRANSPORT, [$STD_CFLAGS], shared_objects_mongodb, yes)
407-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_CHANNEL, [$STD_CFLAGS], shared_objects_mongodb, yes)
408-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS], shared_objects_mongodb, yes)
407+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
408+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_CRYPTO, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
409+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
410+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_OPENSSL, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
411+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_TRANSPORT, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
412+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_CHANNEL, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
413+
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS $LIBMONGOC_CFLAGS], shared_objects_mongodb, yes)
409414

410415

411416
PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
@@ -434,26 +439,6 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
434439
fi
435440

436441

437-
PHP_ARG_WITH(pcre-dir, for pcre-dir install prefix,
438-
[ --with-pcre-dir[=DIR] mongodb: pcre install prefix], auto, yes)
439-
440-
if test "$PHP_PCRE_DIR" != "no"; then
441-
AC_MSG_CHECKING(for pcre)
442-
for i in $PHP_PCRE_DIR /usr /usr/local; do
443-
if test -f $i/include/pcre.h; then
444-
MONGODB_PCRE_DIR=$i/include
445-
AC_MSG_RESULT(found in $i)
446-
break
447-
fi
448-
done
449-
450-
if test -z "$MONGODB_PCRE_DIR"; then
451-
AC_MSG_RESULT(not found)
452-
else
453-
PHP_ADD_INCLUDE($MONGODB_PCRE_DIR)
454-
fi
455-
fi
456-
457442
PHP_ARG_WITH(mongodb-sasl, for Cyrus SASL support,
458443
[ --with-mongodb-sasl[=DIR] mongodb: Include Cyrus SASL support], auto, no)
459444

@@ -510,18 +495,13 @@ fi
510495
AC_CHECK_FUNCS([shm_open], [SHM_LIB=], [AC_CHECK_LIB([rt], [shm_open], [SHM_LIB=-lrt], [SHM_LIB=])])
511496
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $SHM_LIB"
512497

513-
514-
dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, MONGODB_SHARED_LIBADD)
515-
dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, MONGODB_SHARED_LIBADD)
516498
EXTRA_CFLAGS="$PTHREAD_CFLAGS $SASL_CFLAGS"
517499
PHP_SUBST(EXTRA_CFLAGS)
518500
PHP_SUBST(EXTRA_LDFLAGS)
519501

520502
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
521503
PHP_SUBST(MONGODB_SHARED_LIBADD)
522504

523-
dnl }}}
524-
525505
PHP_NEW_EXTENSION(mongodb, $MONGODB_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
526506
PHP_ADD_EXTENSION_DEP(mongodb, date)
527507
PHP_ADD_EXTENSION_DEP(mongodb, json)
@@ -554,9 +534,6 @@ dnl }}}
554534
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
555535
fi
556536

557-
dnl MONGODB_SHARED_DEPENDENCIES="mongodbdep"
558-
dnl PHP_SUBST(MONGODB_SHARED_DEPENDENCIES)
559-
560537
PHP_BSON_BIGENDIAN
561538
AC_HEADER_STDBOOL
562539

‎config.w32

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ if (PHP_MONGODB != "no") {
7777
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-secure-channel.c mongoc-stream-tls-secure-channel.c", "mongodb");
7878
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-sasl.c", "mongodb");
7979

80-
AC_DEFINE("HAVE_MONGOC", 1);
81-
8280
var bson_opts = {
8381
BSON_BYTE_ORDER: 1234,
8482
BSON_OS: 2,

0 commit comments

Comments
 (0)