Merged pull request #926

Author: derickr

config.m4

@@ -189,13 +189,13 @@ if test "$PHP_MONGODB" != "no"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     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.12.0; then
+      if $PKG_CONFIG libbson-1.0 --atleast-version 1.13.0; then
         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.12.0)
+        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.13.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libbson must be installed)
@@ -213,13 +213,13 @@ if test "$PHP_MONGODB" != "no"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     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.12.0; then
+      if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.13.0; then
         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.12.0)
+        AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.13.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libmongoc must be installed)
@@ -315,9 +315,8 @@ if test "$PHP_MONGODB" != "no"; then
 
     PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/common/])
     PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/])
-    PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/bson/])
     PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/jsonsl/])
-    PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libmongoc/src/mongoc/])
+    PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libmongoc/src/])
 
     PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/common/])
     PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/libbson/src/bson/])

config.w32

@@ -66,9 +66,8 @@ if (PHP_MONGODB != "no") {
     /I" + configure_module_dirname + "/src/contrib \
     /I" + configure_module_dirname + "/src/libmongoc/src/common \
     /I" + configure_module_dirname + "/src/libmongoc/src/libbson/src \
-    /I" + configure_module_dirname + "/src/libmongoc/src/libbson/src/bson \
     /I" + configure_module_dirname + "/src/libmongoc/src/libbson/src/jsonsl \
-    /I" + configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc \
+    /I" + configure_module_dirname + "/src/libmongoc/src/libmongoc/src \
   ";
 
   // Condense whitespace in CFLAGS

php_bson.h

@@ -17,7 +17,7 @@
 #ifndef PHONGO_BSON_H
 #define PHONGO_BSON_H
 
-#include <bson.h>
+#include <bson/bson.h>
 
 /* PHP Core stuff */
 #include <php.h>

php_phongo.c

@@ -19,8 +19,8 @@
 #endif
 
 /* External libs */
-#include "bson.h"
-#include "mongoc.h"
+#include "bson/bson.h"
+#include "mongoc/mongoc.h"
 
 /* PHP Core stuff */
 #include <php.h>

php_phongo.h

@@ -18,8 +18,8 @@
 #define PHONGO_H
 
 /* External libs */
-#include "bson.h"
-#include "mongoc.h"
+#include "bson/bson.h"
+#include "mongoc/mongoc.h"
 
 #include "phongo_version.h"
 #include "phongo_compat.h"

src/bson-encode.c

@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <bson.h>
+#include <bson/bson.h>
 
 #include <php.h>
 #include <Zend/zend_hash.h>

src/bson.c

@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <bson.h>
+#include <bson/bson.h>
 
 #include <php.h>
 #include <Zend/zend_hash.h>