s3-waf: Add configuration option for merged build
authorKai Blin <kai@samba.org>
Wed, 21 Apr 2010 05:58:44 +0000 (07:58 +0200)
committerKai Blin <kai@samba.org>
Thu, 20 May 2010 20:16:14 +0000 (22:16 +0200)
commit76e054ba988ec200ba140a6f9f5572d6c310bb40
treee5f5924ed020b00e29f3a4cfc3b688a40d93453f
parent7ba5d2c012cf028b871d29409743b973382bdabe
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