PHPC-1198: Use PHP_MONGODB_BUNDLED_CFLAGS in bundled m4 scripts

This was missed in ce45de4.

Author: jmikola

scripts/autotools/libbson/FindDependencies.m4

@@ -79,7 +79,7 @@ AC_CHECK_FUNC(rand_r, [AC_SUBST(BSON_HAVE_RAND_R, 1)], [], [#include <stdlib.h>]
 # but I actually think it is okay to just check for it even though we will
 # use win32 primatives.
 AX_PTHREAD([
-  PHP_MONGODB_BSON_CFLAGS="$PHP_MONGODB_BSON_CFLAGS $PTHREAD_CFLAGS"
+  PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PTHREAD_CFLAGS"
   PHP_EVAL_LIBLINE([$PTHREAD_LIBS],[MONGODB_SHARED_LIBADD])
 
   # PTHREAD_CFLAGS may come back as "-pthread", which should also be used when

scripts/autotools/libmongoc/CheckCompression.m4

@@ -3,7 +3,7 @@ found_zlib="no"
 bundled_zlib="no"
 
 PKG_CHECK_MODULES([PHP_MONGODB_SNAPPY],[snappy],[
-  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SNAPPY_CFLAGS"
+  PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_SNAPPY_CFLAGS"
   PHP_EVAL_LIBLINE([$PHP_MONGODB_SNAPPY_LIBS],[MONGODB_SHARED_LIBADD])
   found_snappy="yes"
 ],[
@@ -23,7 +23,7 @@ PKG_CHECK_MODULES([PHP_MONGODB_SNAPPY],[snappy],[
 ])
 
 PKG_CHECK_MODULES([PHP_MONGODB_ZLIB],[zlib],[
-  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_ZLIB_CFLAGS"
+  PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_ZLIB_CFLAGS"
   PHP_EVAL_LIBLINE([$PHP_MONGODB_ZLIB_LIBS],[MONGODB_SHARED_LIBADD])
   found_zlib="yes"
 ],[

scripts/autotools/libmongoc/CheckSSL.m4

@@ -30,7 +30,7 @@ AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[
   found_openssl="no"
 
   PKG_CHECK_MODULES([PHP_MONGODB_SSL],[openssl],[
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SSL_CFLAGS"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_SSL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SSL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SSL="openssl"
     found_openssl="yes"
@@ -115,7 +115,7 @@ AS_IF([test "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "auto"],[
   found_libressl="no"
 
   PKG_CHECK_MODULES([PHP_MONGODB_SSL],[libtls libcrypto],[
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SSL_CFLAGS"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_SSL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SSL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SSL="libressl"
     found_libressl="yes"

scripts/autotools/libmongoc/CheckSasl.m4

@@ -9,7 +9,7 @@ AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[
   found_cyrus="no"
 
   PKG_CHECK_MODULES([PHP_MONGODB_SASL],[libsasl2],[
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SASL_CFLAGS"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_SASL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SASL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SASL="cyrus"
     found_cyrus="yes"

scripts/autotools/libmongoc/FindDependencies.m4

@@ -1,8 +1,8 @@
 # Solaris needs to link against socket libs
 if test "$os_solaris" = "yes"; then
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS -D__EXTENSIONS__"
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS -D_XOPEN_SOURCE=1"
-    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D__EXTENSIONS__"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D_XOPEN_SOURCE=1"
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
     PHP_ADD_LIBRARY([socket],,[MONGODB_SHARED_LIBADD])
     PHP_ADD_LIBRARY([nsl],,[MONGODB_SHARED_LIBADD])
 fi
@@ -29,7 +29,7 @@ AC_CHECK_TYPE([socklen_t],
 # require pthreads, but it does appear to be necessary on non-Windows platforms
 # based on mongoc-openssl.c and mongoc-thread-private.h.
 AX_PTHREAD([
-  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PTHREAD_CFLAGS"
+  PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PTHREAD_CFLAGS"
   PHP_EVAL_LIBLINE([$PTHREAD_LIBS],[MONGODB_SHARED_LIBADD])
 
   # PTHREAD_CFLAGS may come back as "-pthread", which should also be used when