Skip to content

Commit ba7aada

Browse files
committed
Only include snappy/zlib checks for bundled libmongoc
1 parent e51a184 commit ba7aada

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

config.m4

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,17 @@ if test "$MONGODB" != "no"; then
329329

330330
AC_CHECK_TYPE([socklen_t], [AC_SUBST(MONGOC_HAVE_SOCKLEN, 1)], [AC_SUBST(MONGOC_HAVE_SOCKLEN, 0)], [#include <sys/socket.h>])
331331

332-
AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 0)
333-
AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
334-
AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
332+
with_snappy=auto
333+
with_zlib=auto
334+
m4_include(src/libmongoc/build/autotools/m4/pkg.m4)
335+
m4_include(src/libmongoc/build/autotools/CheckSnappy.m4)
336+
m4_include(src/libmongoc/build/autotools/CheckZlib.m4)
337+
338+
if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
339+
AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
340+
else
341+
AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
342+
fi
335343
fi
336344

337345

@@ -389,18 +397,6 @@ if test "$MONGODB" != "no"; then
389397
enable_srv=auto
390398
m4_include(src/libmongoc/build/autotools/FindResSearch.m4)
391399

392-
with_snappy=auto
393-
with_zlib=auto
394-
m4_include(src/libmongoc/build/autotools/m4/pkg.m4)
395-
m4_include(src/libmongoc/build/autotools/CheckSnappy.m4)
396-
m4_include(src/libmongoc/build/autotools/CheckZlib.m4)
397-
398-
if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
399-
AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
400-
else
401-
AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
402-
fi
403-
404400
m4_include(src/libmongoc/build/autotools/WeakSymbols.m4)
405401
m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
406402
AX_PTHREAD

0 commit comments

Comments
 (0)