summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-04-21 07:58:44 +0200
committerKai Blin <kai@samba.org>2010-05-20 22:16:14 +0200
commit76e054ba988ec200ba140a6f9f5572d6c310bb40 (patch)
treee5f5924ed020b00e29f3a4cfc3b688a40d93453f
parent7ba5d2c012cf028b871d29409743b973382bdabe (diff)
downloadsamba-76e054ba988ec200ba140a6f9f5572d6c310bb40.tar.gz
samba-76e054ba988ec200ba140a6f9f5572d6c310bb40.tar.bz2
samba-76e054ba988ec200ba140a6f9f5572d6c310bb40.zip
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
-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):