Merge pull request #273

Author: jmikola

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