Skip to content

Commit e8da2fe

Browse files
committed
Define missing macros for kms_message crypto
1 parent d84fcd6 commit e8da2fe

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ if test "$PHP_MONGODB" != "no"; then
266266

267267
if test "$PHP_LIBBSON" = "no" -a "$PHP_LIBMONGOC" = "no"; then
268268
PHP_MONGODB_BUNDLED_CFLAGS="$STD_CFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION"
269+
PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -std=gnu99"
269270

270271
dnl M4 doesn't know if we're building statically or as a shared module, so
271272
dnl attempt to include both paths while ignoring errors. If neither path
@@ -385,7 +386,6 @@ if test "$PHP_MONGODB" != "no"; then
385386

386387
if test "$PHP_CLIENT_SIDE_ENCRYPTION" = "yes"; then
387388
dnl TODO: MONGOCRYPT-219 makes the -std argument obsolete
388-
PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -std=gnu99"
389389

390390
AC_SUBST(MONGOCRYPT_ENABLE_TRACE, 1)
391391
AC_SUBST(MONGOCRYPT_IS_POSIX, 1)

scripts/autotools/libmongocrypt/CheckSSL.m4

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ if test "$PHP_CLIENT_SIDE_ENCRYPTION" != "no"; then
1111
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO, 1)
1212
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO_LIBCRYPTO, 0)
1313
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO_COMMON_CRYPTO, 1)
14+
15+
PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MESSAGE_ENABLE_CRYPTO=1 -DKMS_MESSAGE_ENABLE_CRYPTO_COMMON_CRYPTO=1"
1416
elif test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "libressl"; then
1517
PHP_CLIENT_SIDE_ENCRYPTION="yes"
1618

17-
AC_SUBST(MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION, 1)
1819
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO, 1)
1920
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO_LIBCRYPTO, 1)
2021
AC_SUBST(MONGOCRYPT_ENABLE_CRYPTO_COMMON_CRYPTO, 0)
22+
23+
PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MESSAGE_ENABLE_CRYPTO=1 -DKMS_MESSAGE_ENABLE_CRYPTO_LIBCRYPTO=1"
2124
elif test "$PHP_CLIENT_SIDE_ENCRYPTION" = "auto"; then
2225
PHP_CLIENT_SIDE_ENCRYPTION="no"
2326

0 commit comments

Comments
 (0)