Fix definition of environ on Mac OS X (bugzilla: #5412).

[ira/wip.git] / source3 / configure.in

diff --git a/source3/configure.in b/source3/configure.in
index 292ae070d63bfbdf0aa13c4ea53e137702c8c88c..a37e97c9da60465e811b807e8fc7a83ca64b9e2c 100644 (file)
--- 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 ])
 
 [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
 
 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(samba4.m4)
 fi
 

-m4_include(../lib/zlib/zlib.m4)

 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(ZLIB_OBJS)
 AC_ZLIB([ZLIB_OBJS=""], [
 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(ZLIB_OBJS)
 AC_ZLIB([ZLIB_OBJS=""], [