From 64d0230332351d37873350722f2ce3bcd39728e4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 8 Sep 2011 10:09:12 +1000 Subject: build: Remove obsolete --enable/disable-merged-build All waf builds build everything now. Andrew Bartlett --- source3/wscript | 1 - 1 file changed, 1 deletion(-) diff --git a/source3/wscript b/source3/wscript index f725b623fa..1d40998adb 100644 --- a/source3/wscript +++ b/source3/wscript @@ -32,7 +32,6 @@ def set_options(opt): opt.SAMBA3_ADD_OPTION('ldap') opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable") opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable", without_name="disable") opt.SAMBA3_ADD_OPTION('pam') opt.SAMBA3_ADD_OPTION('pam_smbpass') opt.SAMBA3_ADD_OPTION('quotas') -- cgit