summaryrefslogtreecommitdiff
path: root/source3/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'source3/configure.in')
-rw-r--r--source3/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 292ae070d6..a37e97c9da 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6210,6 +6210,8 @@ AC_ARG_ENABLE(merged-build,
[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
[ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
+m4_include(../lib/zlib/zlib.m4)
+
if test x$enable_merged_build = xauto; then
merged_build_possible=yes
@@ -6239,7 +6241,6 @@ if test x$enable_merged_build = xyes; then
m4_include(samba4.m4)
fi
-m4_include(../lib/zlib/zlib.m4)
AC_SUBST(ZLIB_LIBS)
AC_SUBST(ZLIB_OBJS)
AC_ZLIB([ZLIB_OBJS=""], [