Add CFLAGS directly instead of relying on PHP_EVAL_INCLINE

Author: jmikola

config.m4

@@ -184,18 +184,18 @@ if test "$PHP_MONGODB" != "no"; then
     AC_MSG_CHECKING(for libbson)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
       if $PKG_CONFIG libbson-1.0 --atleast-version 1.9.0; then
-        LIBBSON_INC=`$PKG_CONFIG libbson-1.0 --cflags`
-        LIBBSON_LIB=`$PKG_CONFIG libbson-1.0 --libs`
-        LIBBSON_VER=`$PKG_CONFIG libbson-1.0 --modversion`
-        AC_MSG_RESULT(version $LIBBSON_VER found)
+        PHP_MONGODB_BSON_CFLAGS=`$PKG_CONFIG libbson-1.0 --cflags`
+        PHP_MONGODB_BSON_LIBS=`$PKG_CONFIG libbson-1.0 --libs`
+        PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
+        AC_MSG_RESULT(version $PHP_MONGODB_BSON_VERSION found)
       else
         AC_MSG_ERROR(system libbson must be upgraded to version >= 1.9.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libbson must be installed)
     fi
-    PHP_EVAL_INCLINE($LIBBSON_INC)
-    PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
+    PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
+    PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
     AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
   fi
 
@@ -208,18 +208,18 @@ if test "$PHP_MONGODB" != "no"; then
     AC_MSG_CHECKING(for libmongoc)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
       if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.9.0; then
-        LIBMONGOC_INC=`$PKG_CONFIG libmongoc-1.0 --cflags`
-        LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-1.0 --libs`
-        LIBMONGOC_VER=`$PKG_CONFIG libmongoc-1.0 --modversion`
-        AC_MSG_RESULT(version $LIBMONGOC_VER found)
+        PHP_MONGODB_MONGOC_CFLAGS=`$PKG_CONFIG libmongoc-1.0 --cflags`
+        PHP_MONGODB_MONGOC_LIBS=`$PKG_CONFIG libmongoc-1.0 --libs`
+        PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG libmongoc-1.0 --modversion`
+        AC_MSG_RESULT(version $PHP_MONGODB_MONGOC_VERSION found)
       else
         AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.9.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libmongoc must be installed)
     fi
-    PHP_EVAL_INCLINE($LIBMONGOC_INC)
-    PHP_EVAL_LIBLINE($LIBMONGOC_LIB, MONGODB_SHARED_LIBADD)
+    PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
+    PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
     AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
   fi
 

scripts/build/autotools/libmongoc/CheckCompression.m4

@@ -3,7 +3,7 @@ found_zlib="no"
 bundled_zlib="no"
 
 PKG_CHECK_MODULES([PHP_MONGODB_SNAPPY],[snappy],[
-  PHP_EVAL_INCLINE([$PHP_MONGODB_SNAPPY_CFLAGS])
+  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_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_EVAL_INCLINE([$PHP_MONGODB_ZLIB_CFLAGS])
+  PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_ZLIB_CFLAGS"
   PHP_EVAL_LIBLINE([$PHP_MONGODB_ZLIB_LIBS],[MONGODB_SHARED_LIBADD])
   found_zlib="yes"
 ],[

scripts/build/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_EVAL_INCLINE([$PHP_MONGODB_SSL_CFLAGS])
+    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_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_EVAL_INCLINE([$PHP_MONGODB_SSL_CFLAGS])
+    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SSL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SSL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SSL="libressl"
     found_libressl="yes"

scripts/build/autotools/libmongoc/CheckSasl.m4

@@ -19,7 +19,7 @@ AS_IF([test "$PHP_MONGODB_SASL" = "cyrus" -o "$PHP_MONGODB_SASL" = "auto"],[
   found_cyrus="no"
 
   PKG_CHECK_MODULES([PHP_MONGODB_SASL],[libsasl2],[
-    PHP_EVAL_INCLINE([$PHP_MONGODB_SASL_CFLAGS])
+    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SASL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SASL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SASL="cyrus"
     found_cyrus="yes"
@@ -49,7 +49,7 @@ AS_IF([test "$PHP_MONGODB_SASL" = "gssapi" -o "$PHP_MONGODB_SASL" = "auto"],[
   found_gssapi="no"
 
   PKG_CHECK_MODULES([PHP_MONGODB_SASL],[krb5-gssapi],[
-    PHP_EVAL_INCLINE([$PHP_MONGODB_SASL_CFLAGS])
+    PHP_MONGODB_MONGOC_CFLAGS="$PHP_MONGODB_MONGOC_CFLAGS $PHP_MONGODB_SASL_CFLAGS"
     PHP_EVAL_LIBLINE([$PHP_MONGODB_SASL_LIBS],[MONGODB_SHARED_LIBADD])
     PHP_MONGODB_SASL="gssapi"
     found_gssapi="yes"