s3-waf: Add configuration option for merged build

This doesn't enable the merged build, but doesn't error out when the --disable-merged-build configuration option is set

diff --git a/source3/wscript b/source3/wscript
index 2275f88f1d100b0afdd8efae24f73d1afbcd52f7..420a1230c8b818f8e993bc3bf7d157a898456847 100644 (file)
--- 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):