PHPC-195: Remove mongoc/bson header file workarounds

Author: bjori

CONTRIBUTING.md

@@ -12,13 +12,9 @@ $ cd phongo
 $ git submodule update --init
 $ phpize
 $ ./configure
-$ make patch
 $ make -j8 all
 ```
 
-The `make patch` operation should be a one time operation, but after pulling it new
-changes from upstream.. There may be other patches that need to be applied, likely not.
-
 Be aware that we are submoduling the `master` branch of libmongoc and libbson as
 during the development of phongo there are occasional things we require that simply
 are not yet in a release (or even finished) :)

Makefile.frag

@@ -25,10 +25,6 @@ help:
 	@echo -e "\t$$ make composer"
 	@echo -e "\t       - Installs test dependencies using composer"
 
-	@echo ""
-	@echo -e "\t$$ make patch"
-	@echo -e "\t       - When building phongo from VCS, you must run this once"
-
 	@echo ""
 	@echo -e "\t$$ make release"
 	@echo -e "\t       - Runs the tests and creates the pecl archive on success"
@@ -123,21 +119,6 @@ docs:
 release-docs: docs
 	mkdocs gh-deploy --clean
 
-patch:
-	@if ! test -e $(top_srcdir)/.patched; then \
-		for file in `/bin/ls -1 $(top_srcdir)/patches/*.patch | sort -n`; do \
-			patch -p0 --dry-run -f -s < $$file;\
-			if test $$? -eq 0; then \
-				patch -p0 -f -s < $$file;\
-				echo "$$file patched"; \
-			else \
-				echo "$$file cannot be applied!"; \
-				exit 1; \
-			fi \
-		done; \
-		touch $(top_srcdir)/.patched; \
-	fi
-
 package.xml:
 	php bin/prep-release.php $(PHONGO_VERSION)-$(PHONGO_STABILITY)
 

config.m4

@@ -5,35 +5,7 @@ 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 "/* 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 "/* 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],[
-  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" >> $srcdir/src/libbson/src/bson/bson-config.h]
-])
-AC_DEFUN([MONGOC_DEFINE],[
-  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" >> $srcdir/src/libmongoc/src/mongoc/mongoc-config.h]
-])
 dnl borrowed from PHP acinclude.m4
 AC_DEFUN([PHP_BSON_BIGENDIAN],
 [AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
@@ -55,10 +27,11 @@ int main(void)
   ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
  ])
  if test $ac_cv_c_bigendian_php = yes; then
-    BSON_DEFINE([BSON_BYTE_ORDER], 4321)
+    BSON_BYTE_ORDER=4321
   else
-    BSON_DEFINE([BSON_BYTE_ORDER], 1234)
+    BSON_BYTE_ORDER=1234
  fi
+ AC_SUBST(BSON_BYTE_ORDER)
 ])
 dnl Borrowed from sapi/fpm/config.m4
 AC_DEFUN([PHP_BSON_CLOCK],
@@ -90,7 +63,8 @@ AC_DEFUN([PHP_BSON_CLOCK],
   fi
 
   if test "$have_clock_gettime" = "yes"; then
-    BSON_DEFINE([BSON_HAVE_CLOCK_GETTIME], 1)
+    BSON_HAVE_CLOCK_GETTIME=1
+    AC_SUBST(BSON_HAVE_CLOCK_GETTIME)
   fi
 ])
 
@@ -319,9 +293,9 @@ dnl libmongoc stuff {{{
   PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_phongo, yes)
 
 
-  MONGOC_DEFINE_RESET
   PHP_SETUP_OPENSSL(PHONGO_SHARED_LIBADD)
-  MONGOC_DEFINE([MONGOC_ENABLE_SSL], 1)
+  MONGOC_ENABLE_SSL=1
+  AC_SUBST(MONGOC_ENABLE_SSL)
 
 
 PHP_ARG_WITH(phongo-sasl, Build with Cyrus SASL support,
@@ -348,7 +322,8 @@ if test "$PHP_PHONGO_SASL" != "no"; then
   [
     PHP_ADD_INCLUDE($PHONGO_SASL_DIR)
     PHP_ADD_LIBRARY_WITH_PATH(sasl2, $PHONGO_SASL_DIR/$PHP_LIBDIR, PHONGO_SHARED_LIBADD)
-    MONGOC_DEFINE(MONGOC_ENABLE_SASL, 1, [MONGO SASL support])
+    MONGOC_ENABLE_SASL=1
+    AC_SUBST(MONGOC_ENABLE_SASL)
   ], [
     if test "$PHONGO_SASL" != "auto"; then
       AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])
@@ -398,31 +373,57 @@ dnl }}}
   dnl PHONGO_SHARED_DEPENDENCIES="phongodep"
   dnl PHP_SUBST(PHONGO_SHARED_DEPENDENCIES)
 
-  BSON_DEFINE_RESET
-
   PHP_BSON_BIGENDIAN
   AC_HEADER_STDBOOL
 
   if test "$ac_cv_header_stdbool_h" = "yes"; then
-    BSON_DEFINE([BSON_HAVE_STDBOOL_H], 1)
+    BSON_HAVE_STDBOOL_H=1
   else
-    BSON_DEFINE([BSON_HAVE_STDBOOL_H], 0)
+    BSON_HAVE_STDBOOL_H=0
   fi
+  AC_SUBST(HAVE_STDBOOL_H)
 
-  BSON_DEFINE([BSON_OS], 1)
+  BSON_OS=1
+  AC_SUBST(BSON_OS)
 
   PHP_BSON_CLOCK
   AC_CHECK_FUNC(strnlen,ac_cv_func_strnlen=yes,ac_cv_func_strnlen=no)
   if test "$ac_cv_func_strnlen" = "yes"; then
-    BSON_DEFINE([BSON_HAVE_STRNLEN], 1)
+    BSON_HAVE_STRNLEN=1
   fi
+  AC_SUBST(BSON_HAVE_STRNLEN)
   AC_CHECK_FUNC(snprintf,ac_cv_func_snprintf=yes,ac_cv_func_snprintf=no)
   if test "$ac_cv_func_snprintf" = "yes"; then
-    BSON_DEFINE([BSON_HAVE_SNPRINTF], 1)
+    BSON_HAVE_SNPRINTF=1
   fi
-
-  MONGOC_DEFINE_FLUSH()
-  BSON_DEFINE_FLUSH()
+  AC_SUBST(BSON_HAVE_SNPRINTF)
+
+  m4_include(src/libmongoc/build/autotools/Versions.m4)
+  m4_include(src/libbson/build/autotools/Versions.m4)
+MONGOC_MAJOR_VERSION=mongoc_major_version
+MONGOC_MINOR_VERSION=mongoc_minor_version
+MONGOC_MICRO_VERSION=mongoc_micro_version
+MONGOC_API_VERSION=1.0
+MONGOC_VERSION=mongoc_version
+AC_SUBST(MONGOC_MAJOR_VERSION)
+AC_SUBST(MONGOC_MINOR_VERSION)
+AC_SUBST(MONGOC_MICRO_VERSION)
+AC_SUBST(MONGOC_API_VERSION)
+AC_SUBST(MONGOC_VERSION)
+BSON_MAJOR_VERSION=bson_major_version
+BSON_MINOR_VERSION=bson_minor_version
+BSON_MICRO_VERSION=bson_micro_version
+BSON_API_VERSION=1.0
+BSON_VERSION=bson_version
+AC_SUBST(BSON_MAJOR_VERSION)
+AC_SUBST(BSON_MINOR_VERSION)
+AC_SUBST(BSON_MICRO_VERSION)
+AC_SUBST(BSON_API_VERSION)
+AC_SUBST(BSON_VERSION)
+  AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-config.h)
+  AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
+  AC_OUTPUT($srcdir/src/libbson/src/bson/bson-config.h)
+  AC_OUTPUT($srcdir/src/libbson/src/bson/bson-version.h)
 
   dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
   PHP_ADD_MAKEFILE_FRAGMENT