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 | |
| 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
| -rw-r--r-- | dynconfig/config.m4 | 23 | ||||
| -rwxr-xr-x | dynconfig/wscript | 17 |
2 files changed, 29 insertions, 11 deletions
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4 index 097b9305f6..842a960cd6 100644 --- a/dynconfig/config.m4 +++ b/dynconfig/config.m4 @@ -4,10 +4,6 @@ # ones... AC_PREFIX_DEFAULT(/usr/local/samba) -test x"${modulesdir}" = x"" && { - modulesdir="\${exec_prefix}/modules" -} - BINDIR="${bindir}" SBINDIR="${sbindir}" LIBDIR="${libdir}" @@ -23,7 +19,7 @@ AC_ARG_ENABLE(fhs, [AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])]) if test x$enable_fhs != xyes; then - MODULESDIR="${modulesdir}" + MODULESDIR="${libdir}" INCLUDEDIR="${includedir}" SETUPDIR="${datadir}/setup" PKGCONFIGDIR="${libdir}/pkgconfig" @@ -42,7 +38,7 @@ if test x$enable_fhs != xyes; then else AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]) - MODULESDIR="${modulesdir}/samba" + MODULESDIR="${libdir}/samba" INCLUDEDIR="${includedir}/samba-4.0" SETUPDIR="${datadir}/samba/setup" PKGCONFIGDIR="${libdir}/pkgconfig" @@ -60,6 +56,21 @@ else PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba" fi +AC_ARG_WITH(modulesdir, +[AS_HELP_STRING([--with-modulesdir=DIR], + [Which directory to use for modules ($exec_prefix/modules)])], +[ case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + AC_MSG_WARN([--with-modulesdir called without argument - will use default]) + ;; + * ) + MODULESDIR="$withval" + ;; + esac]) + AC_ARG_WITH(pammodulesdir, [AS_HELP_STRING([--with-pammodulesdir=DIR], [Which directory to use for PAM modules ($libdir/security)])], 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','') |