diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-01-17 12:32:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-17 14:10:16 +0100 |
| commit | 1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1 (patch) | |
| tree | 7b5b705c9e695dab6f8af012e0f0221fe194a734 /dynconfig/wscript | |
| parent | 0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea (diff) | |
| download | samba-1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1.tar.gz samba-1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1.tar.bz2 samba-1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1.zip | |
dynconfig: --with-modulesdir should be a Samba option
This also restores the defaults from Samba 3.6.x:
"${libdir}" or "${libdir}/samba" in FHS mode.
metze
Diffstat (limited to 'dynconfig/wscript')
| -rwxr-xr-x | dynconfig/wscript | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/dynconfig/wscript b/dynconfig/wscript index 374ede27bc..0628326043 100755 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -111,11 +111,6 @@ dynconfig = { 'FHS-PATH': '${PYTHONARCHDIR}', 'OVERWRITE': True, }, - 'MODULESDIR' : { - 'STD-PATH': '${MODULESDIR}', - 'FHS-PATH': '${MODULESDIR}/samba', - 'OVERWRITE': True, - }, 'INCLUDEDIR' : { 'STD-PATH': '${INCLUDEDIR}', 'FHS-PATH': '${INCLUDEDIR}/samba-4.0', @@ -141,6 +136,13 @@ dynconfig = { 'STD-PATH': '${DATADIR}/codepages', 'FHS-PATH': '${DATADIR}/samba/codepages', }, + 'MODULESDIR' : { + 'STD-PATH': '${LIBDIR}', + 'FHS-PATH': '${LIBDIR}/samba', + 'OPTION': '--with-modulesdir', + 'HELPTEXT': 'Which directory to use for Samba modules', + 'OVERWRITE': True, + }, 'PAMMODULESDIR' : { 'STD-PATH': '${LIBDIR}/security', 'FHS-PATH': '${LIBDIR}/security', @@ -247,6 +249,11 @@ def set_options(opt): opt.parser.formatter = SambaIndentedHelpFormatter() opt.parser.formatter.width=Utils.get_term_cols() + for k in ('--with-modulesdir'): + option = opt.parser.get_option(k) + if option: + opt.parser.remove_option(k) + # get all the basic GNU options from the gnu_dirs tool opt_group=opt.add_option_group('Samba-specific directory layout','') |