diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-27 23:39:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-27 23:39:53 +0100 |
| commit | aafe9ca1aa829f64d4bad1df3ee1d5997fb17d71 (patch) | |
| tree | 78a9821d77bd96a523d46ecad8a3e13e20b5756f /source3/configure.in | |
| parent | 807b862bc9a9f34feb14d54344c6818b8febefbc (diff) | |
| download | samba-aafe9ca1aa829f64d4bad1df3ee1d5997fb17d71.tar.gz samba-aafe9ca1aa829f64d4bad1df3ee1d5997fb17d71.tar.bz2 samba-aafe9ca1aa829f64d4bad1df3ee1d5997fb17d71.zip | |
Fix definition of environ on Mac OS X (bugzilla: #5412).
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 3 |
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=""], [ |