CDRIVER-2204 Rename --enable-[snappy|zlib] to --with-[snappy|zlib]

Author: bjori

.evergreen/compile-unix.sh

@@ -182,7 +182,7 @@ case "$MARCH" in
    i386)
       CFLAGS="$CFLAGS -m32 -march=i386"
       # We don't have the 32bit versions of these libs
-      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-snappy --disable-zlib"
+      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-snappy --without-zlib"
    ;;
    s390x)
       CFLAGS="$CFLAGS -march=z196 -mtune=zEC12"

.evergreen/config.yml

@@ -439,7 +439,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--enable-snappy=no --enable-zlib=yes" sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--with-snappy=no --with-zlib" sh .evergreen/compile.sh
         - func: "upload build"
 
     - name: debug-compile-snappy
@@ -452,7 +452,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--enable-snappy=yes --enable-zlib=no" sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--with-snappy --with-zlib=no" sh .evergreen/compile.sh
         - func: "upload build"
 
     - name: debug-compile-compression
@@ -465,7 +465,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--enable-snappy=yes --enable-zlib=yes" sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' EXTRA_CONFIGURE_FLAGS="--with-snappy --with-zlib" sh .evergreen/compile.sh
         - func: "upload build"
 
     - name: test-latest-server-zlib

Makefile.am

@@ -8,8 +8,10 @@ lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 
+SUBDIRS =
+
 if WITH_LIBBSON
-SUBDIRS = src/libbson
+SUBDIRS += src/libbson
 endif
 
 AM_CTAGSFLAGS = --fields=+l --languages=c

NEWS

@@ -12,7 +12,7 @@ mongo-c-driver 1.7.0
     * Support for snappy and zlib. MongoDB 3.4 only supports snappy, while zlib
       support is expected in MongoDB 3.6.
       The enable, configure mongoc like so:
-      ./configure --enable-snappy --enable-zlib
+      ./configure --with-snappy --with-zlib
     * New functions: mongoc_uri_get_compressors & mongoc_uri_set_compressors, to
       get and set compressor configuration on mongoc_uri_t
     * Added support for comma seperated "compressors" connection string option (e.g.

build/autotools/CheckSnappy.m4

@@ -1,38 +1,40 @@
-have_snappy=no
-AC_MSG_CHECKING([whether to enable snappy])
-AC_ARG_ENABLE([snappy],
-              [AS_HELP_STRING([--enable-snappy=@<:@auto/yes/no@:>@],
-                              [Enable wire protocol compression through snappy])],
-              [],
-              [enable_snappy=auto])
-AC_MSG_RESULT([$enable_snappy])
+# If --with-snappy=auto, determine if there is a system installed snappy
+# greater than our required version.
+AS_IF([test "x${with_snappy}" = xauto], [
+      PKG_CHECK_MODULES(SNAPPY, [snappy],
+         [with_snappy=system],
+         [
+            # If we didn't find snappy with pkgconfig
+            with_snappy=no
+            AC_CHECK_LIB([snappy],[snappy_uncompress],
+               [AC_CHECK_HEADER([snappy-c.h],
+                  [
+                     with_snappy=system
+                     SNAPPY_LIBS=-lsnappy
+                  ],
+                  []
+               )],
+               []
+            )
+         ]
+      )
+   ]
+)
 
-AS_IF([test "x$enable_snappy" != "xno"],[
-   PKG_CHECK_MODULES(SNAPPY, [snappy], [have_snappy=yes], [
-      AC_CHECK_LIB([snappy],[snappy_uncompress],[
-         AC_CHECK_HEADER([snappy-c.h], [
-            have_snappy=yes
-            SNAPPY_LIBS=-lsnappy
-         ], [have_snappy=no])
-      ],[have_snappy=no])
-   ])
+AS_IF([test "x${SNAPPY_LIBS}" = "x" -a "x$with_snappy" = "xsystem"],
+      [AC_MSG_ERROR([Cannot find system installed snappy. try --with-snappy=bundled])])
 
-   AC_MSG_CHECKING([snappy is available])
-   if test "$enable_snappy" = "yes" -a "$have_snappy" = "no" ; then
-      AC_MSG_ERROR([You must install the snappy development headers to enable snappy support.])
-   else
-      AC_MSG_RESULT([$have_snappy])
-   fi
+# If we are using the bundled snappy, recurse into its configure.
+AS_IF([test "x${with_snappy}" = xbundled],[
+   AC_MSG_CHECKING(whether to enable bundled snappy)
+   AC_ERROR(bundled snappy is not currently supported)
 ])
 
-if test "x$have_snappy" = "xyes"; then
+if test "x$with_snappy" != "xno"; then
    AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 1)
-   enable_snappy=yes
 else
    AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 0)
-   enable_snappy=no
 fi
 AC_SUBST(SNAPPY_LIBS)
 AC_SUBST(SNAPPY_CFLAGS)
 
-

build/autotools/CheckZlib.m4

@@ -1,38 +1,39 @@
-have_zlib=no
-AC_MSG_CHECKING([whether to enable zlib])
-AC_ARG_ENABLE([zlib],
-              [AS_HELP_STRING([--enable-zlib=@<:@auto/yes/no@:>@],
-                              [Enable wire protocol compression through zlib])],
-              [],
-              [enable_zlib=auto])
-AC_MSG_RESULT([$enable_zlib])
+# If --with-zlib=auto, determine if there is a system installed zlib
+AS_IF([test "x${with_zlib}" = xauto], [
+      PKG_CHECK_MODULES(ZLIB, [zlib],
+         [with_zlib=system],
+         [
+            # If we didn't find zlib with pkgconfig
+            with_zlib=no
+            AC_CHECK_LIB([zlib],[compress2],
+               [AC_CHECK_HEADER([zlib-c.h],
+                  [
+                     with_zlib=system
+                     ZLIB_LIBS=-lz
+                  ],
+                  []
+               )],
+               []
+            )
+         ]
+      )
+   ]
+)
 
-AS_IF([test "x$enable_zlib" != "xno"],[
-   PKG_CHECK_MODULES(ZLIB, [zlib], [have_zlib=yes], [
-      AC_CHECK_LIB([zlib],[compress],[
-         AC_CHECK_HEADER([zlib-c.h], [
-            have_zlib=yes
-            ZLIB_LIBS=-lz
-         ], [have_zlib=no])
-      ],[have_zlib=no])
-   ])
+AS_IF([test "x${ZLIB_LIBS}" = "x" -a "x$with_zlib" = "xsystem"],
+      [AC_MSG_ERROR([Cannot find system installed zlib. try --with-zlib=bundled])])
 
-   AC_MSG_CHECKING([zlib is available])
-   if test "$enable_zlib" = "yes" -a "$have_zlib" = "no" ; then
-      AC_MSG_ERROR([You must install the zlib development headers to enable zlib support.])
-   else
-      AC_MSG_RESULT([$have_zlib])
-   fi
+# If we are using the bundled zlib, recurse into its configure.
+AS_IF([test "x${with_zlib}" = xbundled],[
+   AC_MSG_CHECKING(whether to enable bundled zlib)
+   AC_ERROR(bundled zlib is not currently supported)
 ])
 
-if test "x$have_zlib" = "xyes"; then
+if test "x$with_zlib" != "xno"; then
    AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 1)
-   enable_zlib=yes
 else
    AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
-   enable_zlib=no
 fi
 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(ZLIB_CFLAGS)
 
-

build/autotools/PrintBuildConfiguration.m4

@@ -46,9 +46,10 @@ Build configuration:
   Shared memory performance counters               : ${enable_shm_counters}
   SASL                                             : ${sasl_mode}
   SSL                                              : ${enable_ssl}
-  Snappy Compression                               : ${enable_snappy}
-  Zlib Compression                                 : ${enable_zlib}${experimental_features}
+  Snappy Compression                               : ${with_snappy}
+  Zlib Compression                                 : ${with_zlib}
   Libbson                                          : ${with_libbson}
+${experimental_features}
 
 Documentation:
   man                                              : ${enable_man_pages}

build/autotools/ReadCommandLineArguments.m4

@@ -89,6 +89,22 @@ AC_ARG_WITH(libbson,
 AS_IF([test "x$with_libbson" != xbundled && test "x$with_libbson" != xsystem],
       [with_libbson=auto])
 
+AC_ARG_WITH(snappy,
+    AC_HELP_STRING([--with-snappy=@<:@auto/system/bundled/no@:>@],
+                   [use system installed snappy or bundled snappy. default=auto]),
+    [],
+    [with_snappy=auto])
+AS_IF([test "x$with_snappy" != xbundled && test "x$with_snappy" != xsystem && test "x$with_snappy" != xno],
+      [with_snappy=auto])
+
+AC_ARG_WITH(zlib,
+    AC_HELP_STRING([--with-zlib=@<:@auto/system/bundled/no@:>@],
+                   [use system installed zlib or bundled zlib. default=auto]),
+    [],
+    [with_zlib=auto])
+AS_IF([test "x$with_zlib" != xbundled && test "x$with_zlib" != xsystem && test "x$with_zlib" != xno],
+      [with_zlib=auto])
+
 AC_ARG_ENABLE([html-docs],
               [AS_HELP_STRING([--enable-html-docs=@<:@yes/no@:>@],
                               [build HTML documentation @<:@default=no@:>@])],

build/autotools/SetupAutomake.m4

@@ -27,6 +27,12 @@ AM_CONDITIONAL([ENABLE_PTHREADS],[test "$enable_pthreads" = "yes"])
 # Should we compile the bundled libbson
 AM_CONDITIONAL([WITH_LIBBSON],[test "$with_libbson" = "bundled"])
 
+# Should we compile the bundled snappy
+AM_CONDITIONAL([WITH_SNAPPY],[test "$with_snappy" = "bundled"])
+
+# Should we compile the bundled zlib
+AM_CONDITIONAL([WITH_ZLIB],[test "$with_zlib" = "bundled"])
+
 # Should we avoid extra BSON_LIBS when linking (SunStudio)
 AM_CONDITIONAL([EXPLICIT_LIBS],[test "$with_gnu_ld" = "yes"])
 

configure.ac

@@ -46,7 +46,7 @@ m4_include([build/autotools/CheckSasl.m4])
 m4_include([build/autotools/CheckSnappy.m4])
 m4_include([build/autotools/CheckZlib.m4])
 
-if test "x$have_zlib" = "xyes" -o "x$have_snappy" = "xyes"; then
+if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
    AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
 else
    AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)