diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript | 1 |
1 files changed, 0 insertions, 1 deletions
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') |