Merge pull request #273

jmikola · jmikola · commit 86243cdadd7b · 2016-03-31T10:44:14.000-04:00
diff --git a/config.m4 b/config.m4
@@ -357,7 +357,7 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     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)
@@ -367,6 +367,7 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
     MONGOC_ENABLE_SSL=1
     AC_SUBST(MONGOC_ENABLE_SSL)
+    AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
   fi
 
 
diff --git a/src/libbson b/src/libbson
@@ -1 +1 @@
-Subproject commit eaa5ed04d380dcdeb6c6d8657ed49517be09f492
+Subproject commit 1a0f35a2348ad677ae2fb10d7fc6e65c1a96322e
diff --git a/src/libmongoc b/src/libmongoc
@@ -1 +1 @@
-Subproject commit ffeb6effbc892b22b43cf8e88b294e6a405b6d1f
+Subproject commit b391c273622b8f8b2fae9b43021cda546c0c3486
