build: use mongoc-config.h.in for compile time options.

This is how it is done in libbson as well. Just define them in there and
use that throughout the public headers.

Author: Christian Hergert

configure.ac

@@ -166,6 +166,11 @@ dnl Optionally check for OpenSSL to support TLS streams.
 dnl **************************************************************************
 PKG_CHECK_MODULES(SSL,  openssl, [enable_ssl=yes], [enable_ssl=no])
 AM_CONDITIONAL(HAVE_SSL, test "x$enable_ssl" = "xyes")
+MONGOC_ENABLE_SSL=0
+if test "x$enable_ssl" = "xyes"; then
+	MONGOC_ENABLE_SSL=1
+fi
+AC_SUBST([MONGOC_ENABLE_SSL])
 
 
 dnl **************************************************************************
@@ -262,6 +267,7 @@ dnl **************************************************************************
 AC_CONFIG_FILES([
 	Makefile
 	mongoc/libmongoc-1.0.pc
+	mongoc/mongoc-config.h
 	mongoc/mongoc-version.h
 ])
 AC_OUTPUT

mongoc/.gitignore

@@ -1,4 +1,3 @@
+mongoc-config.h
 mongoc-stdint.h
 mongoc-version.h
-mongoc-build.h
-libmongoc.symbols

mongoc/Makefile.include

@@ -10,126 +10,102 @@ noinst_LTLIBRARIES = libmongoc-priv.la
 lib_LTLIBRARIES = libmongoc-1.0.la
 
 
-BUILT_SOURCES = \
-	$(top_srcdir)/mongoc/mongoc-build.h \
-	$(top_srcdir)/mongoc/libmongoc.symbols
-
-EXPORT_SYMBOLS = \
-	$(top_srcdir)/mongoc/libmongoc-base.symbols
-
-if HAVE_SSL
-EXPORT_SYMBOLS += \
-	$(top_srcdir)/mongoc/libmongoc-ssl.symbols
-endif
-
-$(top_srcdir)/mongoc/libmongoc.symbols: $(EXPORT_SYMBOLS)
-	cat $^ > $@
-
-$(top_srcdir)/mongoc/mongoc-build.h: Makefile
-	echo "" > $@
-if HAVE_SSL
-	echo "#ifndef MONGOC_BUILD_H" >> $@
-	echo "#define MONGOC_BUILD_H" >> $@
-	echo "#define MONGOC_HAVE_SSL" >> $@
-	echo "#endif" >> $@
-endif
-
 INST_H_FILES = \
-	$(top_srcdir)/mongoc/mongoc.h \
-	$(top_srcdir)/mongoc/mongoc-build.h \
-	$(top_srcdir)/mongoc/mongoc-client.h \
-	$(top_srcdir)/mongoc/mongoc-client-pool.h \
-	$(top_srcdir)/mongoc/mongoc-collection.h \
-	$(top_srcdir)/mongoc/mongoc-cursor.h \
-	$(top_srcdir)/mongoc/mongoc-database.h \
-	$(top_srcdir)/mongoc/mongoc-error.h \
-	$(top_srcdir)/mongoc/mongoc-flags.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-page.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-list.h \
-	$(top_srcdir)/mongoc/mongoc-host-list.h \
-	$(top_srcdir)/mongoc/mongoc-init.h \
-	$(top_srcdir)/mongoc/mongoc-index.h \
-	$(top_srcdir)/mongoc/mongoc-log.h \
-	$(top_srcdir)/mongoc/mongoc-opcode.h \
-	$(top_srcdir)/mongoc/mongoc-read-prefs.h \
-	$(top_srcdir)/mongoc/mongoc-stdint.h \
-	$(top_srcdir)/mongoc/mongoc-stream.h \
-	$(top_srcdir)/mongoc/mongoc-stream-buffered.h \
-	$(top_srcdir)/mongoc/mongoc-stream-gridfs.h \
-	$(top_srcdir)/mongoc/mongoc-stream-unix.h \
-	$(top_srcdir)/mongoc/mongoc-uri.h \
-	$(top_srcdir)/mongoc/mongoc-version.h \
-	$(top_srcdir)/mongoc/mongoc-write-concern.h
+	mongoc/mongoc.h \
+	mongoc/mongoc-client.h \
+	mongoc/mongoc-client-pool.h \
+	mongoc/mongoc-collection.h \
+	mongoc/mongoc-cursor.h \
+	mongoc/mongoc-database.h \
+	mongoc/mongoc-error.h \
+	mongoc/mongoc-flags.h \
+	mongoc/mongoc-gridfs.h \
+	mongoc/mongoc-gridfs-file.h \
+	mongoc/mongoc-gridfs-file-page.h \
+	mongoc/mongoc-gridfs-file-list.h \
+	mongoc/mongoc-host-list.h \
+	mongoc/mongoc-init.h \
+	mongoc/mongoc-index.h \
+	mongoc/mongoc-log.h \
+	mongoc/mongoc-opcode.h \
+	mongoc/mongoc-read-prefs.h \
+	mongoc/mongoc-stdint.h \
+	mongoc/mongoc-stream.h \
+	mongoc/mongoc-stream-buffered.h \
+	mongoc/mongoc-stream-gridfs.h \
+	mongoc/mongoc-stream-unix.h \
+	mongoc/mongoc-uri.h \
+	mongoc/mongoc-version.h \
+	mongoc/mongoc-write-concern.h
 if HAVE_SSL
 INST_H_FILES += \
-	$(top_srcdir)/mongoc/mongoc-stream-tls.h \
-	$(top_srcdir)/mongoc/mongoc-ssl.h
+	mongoc/mongoc-stream-tls.h \
+	mongoc/mongoc-ssl.h
 endif
 
 
 NOINST_H_FILES = \
-	$(top_srcdir)/mongoc/mongoc-array-private.h \
-	$(top_srcdir)/mongoc/mongoc-buffer-private.h \
-	$(top_srcdir)/mongoc/mongoc-client-private.h \
-	$(top_srcdir)/mongoc/mongoc-collection-private.h \
-	$(top_srcdir)/mongoc/mongoc-counters-private.h \
-	$(top_srcdir)/mongoc/mongoc-cursor-private.h \
-	$(top_srcdir)/mongoc/mongoc-cluster-private.h \
-	$(top_srcdir)/mongoc/mongoc-database-private.h \
-	$(top_srcdir)/mongoc/mongoc-init-private.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-private.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-private.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-page-private.h \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-list-private.h \
-	$(top_srcdir)/mongoc/mongoc-list-private.h \
-	$(top_srcdir)/mongoc/mongoc-queue-private.h \
-	$(top_srcdir)/mongoc/mongoc-read-prefs-private.h \
-	$(top_srcdir)/mongoc/mongoc-rpc-private.h \
-	$(top_srcdir)/mongoc/mongoc-util-private.h \
-	$(top_srcdir)/mongoc/mongoc-trace.h \
-	$(top_srcdir)/mongoc/mongoc-write-concern-private.h
+	mongoc/mongoc-array-private.h \
+	mongoc/mongoc-buffer-private.h \
+	mongoc/mongoc-client-private.h \
+	mongoc/mongoc-collection-private.h \
+	mongoc/mongoc-counters-private.h \
+	mongoc/mongoc-cursor-private.h \
+	mongoc/mongoc-cluster-private.h \
+	mongoc/mongoc-database-private.h \
+	mongoc/mongoc-init-private.h \
+	mongoc/mongoc-gridfs-private.h \
+	mongoc/mongoc-gridfs-file-private.h \
+	mongoc/mongoc-gridfs-file-page-private.h \
+	mongoc/mongoc-gridfs-file-list-private.h \
+	mongoc/mongoc-list-private.h \
+	mongoc/mongoc-queue-private.h \
+	mongoc/mongoc-read-prefs-private.h \
+	mongoc/mongoc-rpc-private.h \
+	mongoc/mongoc-util-private.h \
+	mongoc/mongoc-trace.h \
+	mongoc/mongoc-write-concern-private.h
 if HAVE_SSL
 NOINST_H_FILES += \
-        $(top_srcdir)/mongoc/mongoc-ssl-private.h
+        mongoc/mongoc-ssl-private.h
 endif
 
 
 libmongoc_priv_la_SOURCES = \
 	$(INST_H_FILES) \
 	$(NOINST_H_FILES) \
-	$(top_srcdir)/mongoc/mongoc-array.c \
-	$(top_srcdir)/mongoc/mongoc-buffer.c \
-	$(top_srcdir)/mongoc/mongoc-client.c \
-	$(top_srcdir)/mongoc/mongoc-client-pool.c \
-	$(top_srcdir)/mongoc/mongoc-cluster.c \
-	$(top_srcdir)/mongoc/mongoc-collection.c \
-	$(top_srcdir)/mongoc/mongoc-counters.c \
-	$(top_srcdir)/mongoc/mongoc-cursor.c \
-	$(top_srcdir)/mongoc/mongoc-database.c \
-	$(top_srcdir)/mongoc/mongoc-init.c \
-	$(top_srcdir)/mongoc/mongoc-gridfs.c \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file.c \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-page.c \
-	$(top_srcdir)/mongoc/mongoc-gridfs-file-list.c \
-	$(top_srcdir)/mongoc/mongoc-index.c \
-	$(top_srcdir)/mongoc/mongoc-list.c \
-	$(top_srcdir)/mongoc/mongoc-log.c \
-	$(top_srcdir)/mongoc/mongoc-queue.c \
-	$(top_srcdir)/mongoc/mongoc-read-prefs.c \
-	$(top_srcdir)/mongoc/mongoc-rpc.c \
-	$(top_srcdir)/mongoc/mongoc-stream.c \
-	$(top_srcdir)/mongoc/mongoc-stream-buffered.c \
-	$(top_srcdir)/mongoc/mongoc-stream-gridfs.c \
-	$(top_srcdir)/mongoc/mongoc-stream-unix.c \
-	$(top_srcdir)/mongoc/mongoc-uri.c \
-	$(top_srcdir)/mongoc/mongoc-util.c \
-	$(top_srcdir)/mongoc/mongoc-write-concern.c
+	mongoc/mongoc-array.c \
+	mongoc/mongoc-buffer.c \
+	mongoc/mongoc-client.c \
+	mongoc/mongoc-client-pool.c \
+	mongoc/mongoc-cluster.c \
+	mongoc/mongoc-collection.c \
+	mongoc/mongoc-counters.c \
+	mongoc/mongoc-cursor.c \
+	mongoc/mongoc-database.c \
+	mongoc/mongoc-init.c \
+	mongoc/mongoc-gridfs.c \
+	mongoc/mongoc-gridfs-file.c \
+	mongoc/mongoc-gridfs-file-page.c \
+	mongoc/mongoc-gridfs-file-list.c \
+	mongoc/mongoc-index.c \
+	mongoc/mongoc-list.c \
+	mongoc/mongoc-log.c \
+	mongoc/mongoc-queue.c \
+	mongoc/mongoc-read-prefs.c \
+	mongoc/mongoc-rpc.c \
+	mongoc/mongoc-stream.c \
+	mongoc/mongoc-stream-buffered.c \
+	mongoc/mongoc-stream-gridfs.c \
+	mongoc/mongoc-stream-unix.c \
+	mongoc/mongoc-uri.c \
+	mongoc/mongoc-util.c \
+	mongoc/mongoc-write-concern.c
+
 if HAVE_SSL
 libmongoc_priv_la_SOURCES += \
-	$(top_srcdir)/mongoc/mongoc-stream-tls.c \
-	$(top_srcdir)/mongoc/mongoc-ssl.c
+	mongoc/mongoc-stream-tls.c \
+	mongoc/mongoc-ssl.c
 endif
 
 
@@ -151,11 +127,11 @@ libmongoc_1_0_la_LIBADD = libmongoc-priv.la
 libmongoc_1_0_la_LDFLAGS = \
 	$(MONGOC_LT_LDFLAGS) \
 	-no-undefined \
-	-export-symbols $(top_srcdir)/mongoc/libmongoc.symbols \
+	-export-symbols-regex "^mongoc_" \
 	-rpath $(libdir)
 
 
 EXTRA_DIST += \
-	$(top_srcdir)/mongoc/mongoc-counters.defs \
-	$(top_srcdir)/mongoc/libmongoc.symbols
+	mongoc/mongoc-counters.defs \
+	mongoc/libmongoc.symbols
 

mongoc/libmongoc-ssl.symbols

@@ -13,6 +13,7 @@ mongoc_client_pool_pop
 mongoc_client_pool_push
 mongoc_client_pool_try_pop
 mongoc_client_set_read_prefs
+mongoc_client_set_ssl_opts
 mongoc_client_set_write_concern
 mongoc_collection_aggregate
 mongoc_collection_aggregate_legacy
@@ -23,11 +24,13 @@ mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
 mongoc_collection_drop_index
+mongoc_collection_ensure_index
 mongoc_collection_find
 mongoc_collection_get_read_prefs
 mongoc_collection_get_write_concern
 mongoc_collection_insert
 mongoc_collection_insert_bulk
+mongoc_collection_keys_to_index_string
 mongoc_collection_save
 mongoc_collection_set_read_prefs
 mongoc_collection_set_write_concern
@@ -48,7 +51,33 @@ mongoc_database_get_write_concern
 mongoc_database_has_collection
 mongoc_database_set_read_prefs
 mongoc_database_set_write_concern
+mongoc_gridfs_create_file
+mongoc_gridfs_create_file_from_stream
+mongoc_gridfs_destroy
+mongoc_gridfs_drop
+mongoc_gridfs_file_destroy
+mongoc_gridfs_file_get_aliases
+mongoc_gridfs_file_get_content_type
+mongoc_gridfs_file_get_filename
+mongoc_gridfs_file_get_md5
+mongoc_gridfs_file_get_metadata
+mongoc_gridfs_file_list_destroy
+mongoc_gridfs_file_list_next
+mongoc_gridfs_file_readv
+mongoc_gridfs_file_save
+mongoc_gridfs_file_seek
+mongoc_gridfs_file_set_aliases
+mongoc_gridfs_file_set_content_type
+mongoc_gridfs_file_set_filename
+mongoc_gridfs_file_set_md5
+mongoc_gridfs_file_set_metadata
+mongoc_gridfs_file_writev
+mongoc_gridfs_find
+mongoc_gridfs_find_one
+mongoc_gridfs_find_one_by_filename
 mongoc_host_list_from_string
+mongoc_index_opt_get_default
+mongoc_index_opt_init
 mongoc_init
 mongoc_log
 mongoc_log_set_handler
@@ -61,13 +90,19 @@ mongoc_read_prefs_is_valid
 mongoc_read_prefs_new
 mongoc_read_prefs_set_mode
 mongoc_read_prefs_set_tags
+mongoc_ssl_opt_get_default
+mongoc_stream_buffered_new
 mongoc_stream_close
 mongoc_stream_cork
 mongoc_stream_destroy
 mongoc_stream_flush
+mongoc_stream_gridfs_new
 mongoc_stream_read
 mongoc_stream_readv
 mongoc_stream_setsockopt
+mongoc_stream_tls_check_cert
+mongoc_stream_tls_do_handshake
+mongoc_stream_tls_new
 mongoc_stream_uncork
 mongoc_stream_unix_new
 mongoc_stream_writev

mongoc/libmongoc-base.symbols renamed to mongoc/libmongoc.symbols

@@ -24,14 +24,14 @@
 #include "mongoc-buffer-private.h"
 #include "mongoc-client.h"
 #include "mongoc-cluster-private.h"
+#include "mongoc-config.h"
 #include "mongoc-host-list.h"
 #include "mongoc-read-prefs.h"
 #include "mongoc-rpc-private.h"
 #include "mongoc-stream.h"
 #include "mongoc-write-concern.h"
-#include "mongoc-build.h"
 
-#ifdef MONGOC_HAVE_SSL
+#ifdef MONGOC_ENABLE_SSL
 #include "mongoc-ssl.h"
 #endif
 
@@ -48,7 +48,8 @@ struct _mongoc_client_t
 
    mongoc_stream_initiator_t  initiator;
    void                      *initiator_data;
-#ifdef MONGOC_HAVE_SSL
+
+#ifdef MONGOC_ENABLE_SSL
    mongoc_ssl_opt_t           ssl_opts;
 #endif