PHPC-2274 and PHPC-2308: Endian detection for KMS sources (#1479)

* PHPC-2274: Apply libmongocrypt defs to PHP_MONGODB_LIBMONGOCRYPT_CFLAGS

This ensures PHP_MONGODB_LIBMONGOCRYPT_CFLAGS is used instead of PHP_MONGODB_BUNDLED_CFLAGS for libmongocrypt-specific checks.

A libmongoc-specific copy of Endian.m4 has been created to use when building without libmongocrypt, since the endianness check is still required by libmongoc's bundled KMS sources.

* PHPC-2308: Handle unknown and universal cases for AC_C_BIGENDIAN

Author: jmikola

config.m4

@@ -328,6 +328,9 @@ if test "$PHP_MONGODB" != "no"; then
     dnl CheckCompression.m4 will modify this when using bundled zlib
     PHP_MONGODB_ZLIB_CFLAGS=""
 
+    dnl Endian.m4 will modify this when using bundled libmongocrypt
+    PHP_MONGODB_LIBMONGOCRYPT_CFLAGS=""
+
     dnl M4 doesn't know if we're building statically or as a shared module, so
     dnl attempt to include both paths while ignoring errors. If neither path
     dnl exists, report an error during configure (this is later than M4 parsing
@@ -364,6 +367,7 @@ if test "$PHP_MONGODB" != "no"; then
     _include([scripts/autotools/libmongoc/CheckSasl.m4])
     _include([scripts/autotools/libmongoc/CheckSSL.m4])
     _include([scripts/autotools/libmongoc/CheckUtf8Proc.m4])
+    _include([scripts/autotools/libmongoc/Endian.m4])
     _include([scripts/autotools/libmongoc/FindDependencies.m4])
     _include([scripts/autotools/libmongoc/Versions.m4])
     _include([scripts/autotools/libmongoc/WeakSymbols.m4])
@@ -482,7 +486,7 @@ if test "$PHP_MONGODB" != "no"; then
     fi
 
     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
-      PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="-DKMS_MSG_STATIC -DMLIB_USER"
+      PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MSG_STATIC -DMLIB_USER"
 
       dnl Since libmongocrypt adds kms-message, we can enable AWS auth in this case
       AC_SUBST(MONGOC_ENABLE_MONGODB_AWS_AUTH, 1)
@@ -505,7 +509,6 @@ if test "$PHP_MONGODB" != "no"; then
       dnl Generated with: find src/libmongocrypt/kms-message/src -maxdepth 1 -name '*.c' -print0 | cut -sz -d / -f 5- | sort -dz | tr '\000' ' '
       PHP_MONGODB_MONGOCRYPT_KMS_MESSAGE_SOURCES="hexlify.c kms_azure_request.c kms_b64.c kms_caller_identity_request.c kms_crypto_apple.c kms_crypto_libcrypto.c kms_crypto_none.c kms_crypto_windows.c kms_decrypt_request.c kms_encrypt_request.c kms_gcp_request.c kms_kmip_reader_writer.c kms_kmip_request.c kms_kmip_response.c kms_kmip_response_parser.c kms_kv_list.c kms_message.c kms_port.c kms_request.c kms_request_opt.c kms_request_str.c kms_response.c kms_response_parser.c sort.c"
 
-      PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS"
       PHP_MONGODB_ADD_SOURCES([src/libmongocrypt/src/], $PHP_MONGODB_MONGOCRYPT_SOURCES, $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS)
       PHP_MONGODB_ADD_SOURCES([src/libmongocrypt/src/crypto/], $PHP_MONGODB_MONGOCRYPT_CRYPTO_SOURCES, $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS)
       PHP_MONGODB_ADD_SOURCES([src/libmongocrypt/src/os_posix/], $PHP_MONGODB_MONGOCRYPT_OS_POSIX_SOURCES, $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS)

scripts/autotools/libbson/Endian.m4

@@ -1,5 +1,6 @@
-AC_C_BIGENDIAN
-AC_SUBST(BSON_BYTE_ORDER, 1234)
-if test "x$ac_cv_c_bigendian" = "xyes"; then
-    AC_SUBST(BSON_BYTE_ORDER, 4321)
-fi
+AC_C_BIGENDIAN(
+  [AC_SUBST(BSON_BYTE_ORDER, 4321)],
+  [AC_SUBST(BSON_BYTE_ORDER, 1234)],
+  [AC_MSG_ERROR([unknown endianness])],
+  [AC_MSG_ERROR([universal endianness is not supported])]
+)

scripts/autotools/libmongoc/Endian.m4

@@ -0,0 +1,6 @@
+AC_C_BIGENDIAN(
+  [PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -DKMS_MESSAGE_BIG_ENDIAN=1"],
+  [PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -DKMS_MESSAGE_LITTLE_ENDIAN=1"],
+  [AC_MSG_ERROR([unknown endianness])],
+  [AC_MSG_ERROR([universal endianness is not supported])]
+)

scripts/autotools/libmongocrypt/Endian.m4

@@ -1,6 +1,6 @@
-AC_C_BIGENDIAN
-if test "x$ac_cv_c_bigendian" = "xyes"; then
-    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -DKMS_MESSAGE_BIG_ENDIAN=1 -DMONGOCRYPT_BIG_ENDIAN=1"
-else
-    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -DKMS_MESSAGE_LITTLE_ENDIAN=1 -DMONGOCRYPT_LITTLE_ENDIAN=1"
-fi
+AC_C_BIGENDIAN(
+  [PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MESSAGE_BIG_ENDIAN=1 -DMONGOCRYPT_BIG_ENDIAN=1"],
+  [PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MESSAGE_LITTLE_ENDIAN=1 -DMONGOCRYPT_LITTLE_ENDIAN=1"],
+  [AC_MSG_ERROR([unknown endianness])],
+  [AC_MSG_ERROR([universal endianness is not supported])]
+)