Add flag for merged build.

diff --git a/source3/configure.in b/source3/configure.in
index c26e65f1281497a20324676a2cb44dd4a3f974e0..8ea7e963ce0f6ea2bda6849612ff811d8e2e1782 100644 (file)
--- 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 470a5a415f79a5e68d0816e1722d95c2bb0a2a4c..86047c19a65e52cae9a3545d5940d553bdde6bd0 100644 (file)
--- 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"