CDRIVER-1160: configure flag for MONGOC_NO_AUTOMATIC_GLOBALS

Author: bjori

CMakeLists.txt

@@ -10,6 +10,7 @@ NOTE: OpenSSL is required for authenticating to MongoDB 3.0 and later."
 option(ENABLE_SASL "Use Cyrus SASL library for Kerberos." ON)
 option(ENABLE_TESTS "Build MongoDB C Driver tests." ON)
 option(ENABLE_EXAMPLES "Build MongoDB C Driver examples." ON)
+option(ENABLE_AUTOMATIC_INIT_AND_CLEANUP "Enable automatic init and cleanup (GCC only)" ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
 
@@ -35,6 +36,12 @@ else ()
    set (MONGOC_ENABLE_SASL 0)
 endif ()
 
+if (ENABLE_AUTOMATIC_INIT_AND_CLEANUP)
+   set (MONGOC_NO_AUTOMATIC_GLOBALS 0)
+else ()
+   set (MONGOC_NO_AUTOMATIC_GLOBALS 1)
+endif ()
+
 set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)

build/autotools/AutomaticInitAndCleanup.m4

@@ -0,0 +1,6 @@
+AS_IF([test "$enable_automatic_init_and_cleanup" != "no"], [
+   AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 0)
+], [
+   AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
+])
+

build/autotools/PrintBuildConfiguration.m4

@@ -30,6 +30,7 @@ Build configuration:
   Compile with debug symbols (slow)                : ${enable_debug_symbols}
   Enable GCC build optimization                    : ${enable_optimizations}
   Enable automatic binary hardening                : ${enable_hardening}
+  Enable automatic init and cleanup                : ${enable_automatic_init_and_cleanup}
   Code coverage support                            : ${enable_coverage}
   Cross Compiling                                  : ${enable_crosscompile}
   Fast counters                                    : ${enable_rdtscp}

build/autotools/ReadCommandLineArguments.m4

@@ -10,6 +10,12 @@ AC_ARG_ENABLE(tracing,
     [],[enable_tracing="no"])
 AC_MSG_RESULT([$enable_tracing])
 
+AC_MSG_CHECKING([whether to automatic init and cleanup])
+AC_ARG_ENABLE(automatic-init-and-cleanup,
+    AC_HELP_STRING([--enable-automatic-init-and-cleanup], [turn on automatic mongoc_init() and mongoc_cleanup() [default=yes]]),
+    [],[enable_automatic_init_and_cleanup="yes"])
+AC_MSG_RESULT([$enable_automatic_init_and_cleanup])
+
 AC_MSG_CHECKING([whether to enable optimized builds])
 AC_ARG_ENABLE(optimizations, 
     AC_HELP_STRING([--enable-optimizations], [turn on build-time optimizations [default=yes]]),

configure.ac

@@ -33,6 +33,7 @@ m4_include([build/autotools/Optimizations.m4])
 m4_include([build/autotools/Coverage.m4])
 m4_include([build/autotools/LDVersionScript.m4])
 m4_include([build/autotools/WeakSymbols.m4])
+m4_include([build/autotools/AutomaticInitAndCleanup.m4])
 
 # We would put AM_INIT_AUTOMAKE into SetupAutomake.m4, but seems to cause
 # autoconf errors.

src/mongoc/mongoc-config.h.in

@@ -66,4 +66,15 @@
 #endif
 
 
+/*
+ * Disable automatic calls to mongoc_init() and mongoc_cleanup()
+ * before main() is called, and after exit() (respectively).
+ */
+#define MONGOC_NO_AUTOMATIC_GLOBALS @MONGOC_NO_AUTOMATIC_GLOBALS@
+
+#if MONGOC_NO_AUTOMATIC_GLOBALS != 1
+#  undef MONGOC_NO_AUTOMATIC_GLOBALS
+#endif
+
+
 #endif /* MONGOC_CONFIG_H */