From 76e054ba988ec200ba140a6f9f5572d6c310bb40 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Wed, 21 Apr 2010 07:58:44 +0200 Subject: 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 --- source3/wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'source3') 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): -- cgit