PHPC-151: Bump to libbson-1.1.0 and mongoc-1.1.0 and fix build

Author: bjori

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "src/libmongoc"]
 	path = src/libmongoc
-	url = https://github.com/bjori/mongo-c-driver.git
-	branch = phongo
+	url = https://github.com/mongodb/mongo-c-driver.git
+	branch = master
 [submodule "src/libbson"]
 	path = src/libbson
 	url = https://github.com/mongodb/libbson.git

config.m4

@@ -5,11 +5,27 @@ PHP_ARG_WITH(openssl-dir, OpenSSL dir for phongo,
 [  --with-openssl-dir[=DIR]  openssl install prefix], yes, no)
 
 
+AC_DEFUN([MONGOC_DEFINE_FLUSH],[
+  [echo "#endif" >> $srcdir/src/libmongoc/src/mongoc/mongoc-config.h]
+])
+AC_DEFUN([BSON_DEFINE_FLUSH],[
+  [echo "#endif" >> $srcdir/src/libbson/src/bson/bson-config.h]
+])
+
+
 AC_DEFUN([MONGOC_DEFINE_RESET],[
-  [echo "" > $srcdir/src/libmongoc/src/mongoc/mongoc-config.h]
+  [echo -e "/* Generated by phongo */
+#ifndef MONGOC_CONFIG_H
+#define MONGOC_CONFIG_H
+
+" > $srcdir/src/libmongoc/src/mongoc/mongoc-config.h]
 ])
 AC_DEFUN([BSON_DEFINE_RESET],[
-  [echo "" > $srcdir/src/libbson/src/bson/bson-config.h]
+  [echo "/* Generated by phongo */
+#ifndef BSON_CONFIG_H
+#define BSON_CONFIG_H
+
+" > $srcdir/src/libbson/src/bson/bson-config.h]
 ])
 dnl borrowed from PHP acinclude.m4
 AC_DEFUN([BSON_DEFINE],[
@@ -219,6 +235,7 @@ if test "$PHONGO" != "no"; then
 	mongoc-array.c \
 	mongoc-buffer.c \
 	mongoc-bulk-operation.c \
+	mongoc-b64.c \
 	mongoc-client.c \
 	mongoc-client-pool.c \
 	mongoc-cluster.c \
@@ -391,6 +408,9 @@ dnl }}}
     BSON_DEFINE([BSON_HAVE_SNPRINTF], 1)
   fi
 
+  MONGOC_DEFINE_FLUSH()
+  BSON_DEFINE_FLUSH()
+
   dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
   PHP_ADD_MAKEFILE_FRAGMENT