diff --git a/config.m4 b/config.m4 index 28998f5e8..57f2c42c5 100644 --- a/config.m4 +++ b/config.m4 @@ -338,7 +338,6 @@ if test "$PHP_MONGODB" != "no"; then m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/CheckHost.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/PlatformFlags.m4) - m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/CheckAtomics.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/CheckHeaders.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/Endian.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/FindDependencies.m4) @@ -352,7 +351,6 @@ if test "$PHP_MONGODB" != "no"; then m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/Endian.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/FindDependencies.m4) m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/Versions.m4) - m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/WeakSymbols.m4) dnl This include modifies the value of $PHP_MONGODB_CLIENT_SIDE_ENCRYPTION to "yes" dnl or "no" depending on whether dependencies for libmongocrypt are fulfilled diff --git a/config.w32 b/config.w32 index dbded6599..91199a87b 100644 --- a/config.w32 +++ b/config.w32 @@ -130,28 +130,16 @@ if (PHP_MONGODB != "no") { BSON_OS: 2, BSON_HAVE_STDBOOL_H: 0, BSON_HAVE_STRINGS_H: 0, - BSON_HAVE_ATOMIC_32_ADD_AND_FETCH: 0, - BSON_HAVE_ATOMIC_64_ADD_AND_FETCH: 0, - BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES: 0, BSON_HAVE_CLOCK_GETTIME: 0, BSON_HAVE_STRNLEN: 0, BSON_HAVE_SNPRINTF: 0, BSON_HAVE_STRLCPY: 0, - BSON_HAVE_REALLOCF: 0, - BSON_NEEDS_SET_OUTPUT_FORMAT: 0, BSON_HAVE_TIMESPEC: 0, BSON_EXTRA_ALIGN: 0, - BSON_HAVE_SYSCALL_TID: 0, - BSON_HAVE_DECIMAL128: 0, BSON_HAVE_GMTIME_R: 0, - BSON_HAVE_RAND_R: 0, - BSON_HAVE_ARC4RANDOM_BUF: 0 + BSON_HAVE_RAND_R: 0 }; - if (CHECK_FUNC_IN_HEADER("stdio.h", "_set_output_format")) { - bson_opts.BSON_NEEDS_SET_OUTPUT_FORMAT = 1; - } - mongodb_generate_header( configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h.in", configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h", @@ -187,7 +175,6 @@ if (PHP_MONGODB != "no") { MONGOC_ENABLE_MONGODB_AWS_AUTH: 0, MONGOC_ENABLE_SASL: 0, MONGOC_ENABLE_SASL_CYRUS: 0, - MONGOC_ENABLE_SASL_GSSAPI: 0, MONGOC_ENABLE_SASL_SSPI: 0, MONGOC_ENABLE_SRV: 0, MONGOC_ENABLE_RDTSCP: 0, @@ -196,7 +183,6 @@ if (PHP_MONGODB != "no") { MONGOC_HAVE_SASL_CLIENT_DONE: 0, MONGOC_HAVE_SCHED_GETCPU: 0, MONGOC_HAVE_SOCKLEN: 1, - MONGOC_HAVE_WEAK_SYMBOLS: 0, MONGOC_NO_AUTOMATIC_GLOBALS: 1, MONGOC_SOCKET_ARG2: "struct sockaddr", MONGOC_SOCKET_ARG3: "socklen_t", diff --git a/scripts/autotools/libbson/CheckAtomics.m4 b/scripts/autotools/libbson/CheckAtomics.m4 deleted file mode 100644 index 3071e36df..000000000 --- a/scripts/autotools/libbson/CheckAtomics.m4 +++ /dev/null @@ -1,23 +0,0 @@ -AC_LANG_PUSH([C]) -AC_MSG_CHECKING([for __sync_add_and_fetch_4]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int32_t v = 1; return __sync_add_and_fetch_4 (&v, (int32_t)10);]])], - [AC_MSG_RESULT(yes) - have_sync_add_and_fetch_4=yes], - [AC_MSG_RESULT(no) - have_sync_add_and_fetch_4=no]) -AS_IF([test "$have_sync_add_and_fetch_4" = "yes"], - [AC_SUBST(BSON_HAVE_ATOMIC_32_ADD_AND_FETCH, 1)], - [AC_SUBST(BSON_HAVE_ATOMIC_32_ADD_AND_FETCH, 0)]) - -AC_MSG_CHECKING([for __sync_add_and_fetch_8]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int64_t v; return __sync_add_and_fetch_8 (&v, (int64_t)10);]])], - [AC_MSG_RESULT(yes) - have_sync_add_and_fetch_8=yes], - [AC_MSG_RESULT(no) - have_sync_add_and_fetch_8=no]) -AS_IF([test "$have_sync_add_and_fetch_8" = "yes"], - [AC_SUBST(BSON_HAVE_ATOMIC_64_ADD_AND_FETCH, 1)], - [AC_SUBST(BSON_HAVE_ATOMIC_64_ADD_AND_FETCH, 0)]) -AC_LANG_POP([C]) diff --git a/scripts/autotools/libbson/FindDependencies.m4 b/scripts/autotools/libbson/FindDependencies.m4 index f365f6c21..2472e0a1b 100644 --- a/scripts/autotools/libbson/FindDependencies.m4 +++ b/scripts/autotools/libbson/FindDependencies.m4 @@ -13,46 +13,6 @@ if test "$bson_cv_have_strnlen" = yes; then AC_SUBST(BSON_HAVE_STRNLEN, 1) fi -# Check for reallocf() (BSD/Darwin) -AC_SUBST(BSON_HAVE_REALLOCF, 0) -AC_CACHE_CHECK([for reallocf], - bson_cv_have_reallocf, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -int reallocf () { return 0; } -]])], - [bson_cv_have_reallocf=no], - [bson_cv_have_reallocf=yes])]) -if test "$bson_cv_have_reallocf" = yes; then - AC_SUBST(BSON_HAVE_REALLOCF, 1) -fi - -# Check for syscall() -AC_SUBST(BSON_HAVE_SYSCALL_TID, 0) -AC_CACHE_CHECK([for syscall], - bson_cv_have_syscall_tid, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -int syscall () { return 0; } -]])], - [bson_cv_have_syscall_tid=no], - [bson_cv_have_syscall_tid=yes])]) -if test "$bson_cv_have_syscall_tid" = yes -a "$os_darwin" != "yes"; then - AC_CACHE_CHECK([for SYS_gettid], - bson_cv_have_sys_gettid_tid, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -int gettid () { return SYS_gettid; } - ]])], - [bson_cv_have_sys_gettid_tid=yes], - [bson_cv_have_sys_gettid_tid=no])]) - if test "$bson_cv_have_sys_gettid_tid" = yes; then - AC_SUBST(BSON_HAVE_SYSCALL_TID, 1) - fi -fi - # Check for snprintf() AC_SUBST(BSON_HAVE_SNPRINTF, 0) AC_CHECK_FUNC(snprintf, [AC_SUBST(BSON_HAVE_SNPRINTF, 1)]) @@ -79,10 +39,6 @@ AC_CHECK_FUNC(gmtime_r, [AC_SUBST(BSON_HAVE_GMTIME_R, 1)]) AC_SUBST(BSON_HAVE_RAND_R, 0) AC_CHECK_FUNC(rand_r, [AC_SUBST(BSON_HAVE_RAND_R, 1)]) -# Check for arc4random_buf() -AC_SUBST(BSON_HAVE_ARC4RANDOM_BUF, 0) -AC_CHECK_FUNC(arc4random_buf, [AC_SUBST(BSON_HAVE_ARC4RANDOM_BUF, 1)]) - # Check for pthreads. We might need to make this better to handle mingw, # but I actually think it is okay to just check for it even though we will # use win32 primatives. @@ -96,26 +52,3 @@ AX_PTHREAD([ ],[ AC_MSG_ERROR([libbson requires pthreads on non-Windows platforms.]) ]) - - -# The following is borrowed from the guile configure script. -# -# On past versions of Solaris, believe 8 through 10 at least, you -# had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };". -# This is contrary to POSIX: -# http://www.opengroup.org/onlinepubs/000095399/functions/pthread_once.html -# Check here if this style is required. -# -# glibc (2.3.6 at least) works both with or without braces, so the -# test checks whether it works without. -# -AC_SUBST(BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES, 0) -AC_CACHE_CHECK([whether PTHREAD_ONCE_INIT needs braces], - bson_cv_need_braces_on_pthread_once_init, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - pthread_once_t foo = PTHREAD_ONCE_INIT;]])], - [bson_cv_need_braces_on_pthread_once_init=no], - [bson_cv_need_braces_on_pthread_once_init=yes])]) -if test "$bson_cv_need_braces_on_pthread_once_init" = yes; then - AC_SUBST(BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES, 1) -fi diff --git a/scripts/autotools/libmongoc/WeakSymbols.m4 b/scripts/autotools/libmongoc/WeakSymbols.m4 deleted file mode 100644 index 1a54a4fe7..000000000 --- a/scripts/autotools/libmongoc/WeakSymbols.m4 +++ /dev/null @@ -1,9 +0,0 @@ -AC_MSG_CHECKING(if weak symbols are supported) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -__attribute__((weak)) void __dummy(void *x) { } -void f(void *x) { __dummy(x); } -]], [[ ]] -)], -[AC_MSG_RESULT(yes) -AC_SUBST(MONGOC_HAVE_WEAK_SYMBOLS, 1)], -[AC_MSG_RESULT(no)])