build: Remove obsolete --enable/disable-merged-build

All waf builds build everything now.

Andrew Bartlett

diff --git a/source3/wscript b/source3/wscript
index f725b623fabcf3b30bf8877cec8ac0ff3e4149cd..1d40998adbad43a441d0d888e6aabe3ce43ed573 100644 (file)
--- 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')