sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

dynconfig: --with-modulesdir should be a Samba option

Browse Source 
This also restores the defaults from Samba 3.6.x:
"${libdir}" or "${libdir}/samba" in FHS mode.

metze
This commit is contained in:
Stefan Metzmacher 2012-01-17 12:32:47 +01:00
parent 0ca1f321ac
commit 1f7dbc665c
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dynconfig/config.m4
View File

@ -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)])],

17
dynconfig/wscript
View File

@ -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','')