diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-08 10:09:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:45:20 +1100 |
| commit | 64d0230332351d37873350722f2ce3bcd39728e4 (patch) | |
| tree | 827e1edd8cf37a2fbbc05101e6e2166b4dbd21dd | |
| parent | 4980cd772a6c81b528d5a40646f4f1d0dde17b16 (diff) | |
| download | samba-64d0230332351d37873350722f2ce3bcd39728e4.tar.gz samba-64d0230332351d37873350722f2ce3bcd39728e4.tar.bz2 samba-64d0230332351d37873350722f2ce3bcd39728e4.zip | |
build: Remove obsolete --enable/disable-merged-build
All waf builds build everything now.
Andrew Bartlett
| -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') |