summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/wscript b/source3/wscript
index 2275f88f1d..420a1230c8 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -36,6 +36,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('krb5')
opt.SAMBA3_ADD_OPTION('ldap')
opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
+ opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable", without_name="disable")
def configure(conf):