summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-14 21:46:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-14 21:46:58 +0200
commit5c16a0618579d1dca03f33159390b371e6853604 (patch)
tree8079ab1c693bd39186990afe255c7b45a296b215 /source3
parentf4f59bf24803df975ed38d558c7b0931ca575c3d (diff)
downloadsamba-5c16a0618579d1dca03f33159390b371e6853604.tar.gz
samba-5c16a0618579d1dca03f33159390b371e6853604.tar.bz2
samba-5c16a0618579d1dca03f33159390b371e6853604.zip
Allow auto-detect if --enable-merged-build was not specified.
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 1eba4a0a58..55a6926186 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6219,7 +6219,8 @@ MSG
fi
AC_ARG_ENABLE(merged-build,
-[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
+[], [ enable_merged_build=auto ])
if test x$enable_merged_build = xyes; then
MERGED_BUILD=1