From 25b08eb2e2645eece1a3fe20de988c9a2f328d36 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 15 Sep 2008 15:16:54 +0200
Subject: Add flag for merged build.

---
 source3/configure.in | 13 +++++++------
 source3/samba4.m4    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index c26e65f128..8ea7e963ce 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6198,12 +6198,13 @@ MSG
 
 fi
 
-esyscmd([test -d ../samba4])
-ifelse(sysval,0,[
-AC_SUBST(MERGED_BUILD)
-MERGED_BUILD=1
-m4_include(samba4.m4)
-],[])
+AC_ARG_ENABLE(merged-build, 
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+
+if test x$enable_merged_build = xyes; then
+	MERGED_BUILD=1
+	m4_include(samba4.m4)
+fi
 
 dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 LIB_REMOVE_USR_LIB(LDFLAGS)
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 470a5a415f..86047c19a6 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -101,7 +101,7 @@ m4_include(nsswitch/config.m4)
 dnl Samba 4 files
 AC_SUBST(LD)
 AC_LIBREPLACE_SHLD_FLAGS
-SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ])
+SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS])
 		 
 oldbuilddir="$builddir"
 builddir="$builddir/../source4"
-- 
cgit