The branch, master has been updated via e9874bd dynconfig: overwrite --with-privatelibdir as a Samba option via 1f7dbc6 dynconfig: --with-modulesdir should be a Samba option via 0ca1f32 dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and datarootdir in Makefile from 7d83d37 s3:lib/messages: remove unused messaging_event_context()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e9874bdf9ef79e0e8c115af14d6727e6624e4d20 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Jan 17 12:51:57 2012 +0100 dynconfig: overwrite --with-privatelibdir as a Samba option metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Tue Jan 17 17:17:56 CET 2012 on sn-devel-104 commit 1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Jan 17 12:32:47 2012 +0100 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 commit 0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea Author: Stefan Metzmacher <me...@samba.org> Date: Tue Jan 17 12:29:53 2012 +0100 dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and datarootdir in Makefile Otherwise $prefix is "NONE" without explicit --prefix metze ----------------------------------------------------------------------- Summary of changes: dynconfig/config.m4 | 59 ++++++++++++++++++++++++++++++-------------------- dynconfig/wscript | 24 ++++++++++++++++---- 2 files changed, 54 insertions(+), 29 deletions(-) Changeset truncated at 500 lines: diff --git a/dynconfig/config.m4 b/dynconfig/config.m4 index e7a7228..842a960 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,43 +19,58 @@ 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" SWATDIR="${datadir}/swat" CODEPAGEDIR="${datadir}/codepages" PAMMODULESDIR="${libdir}/security" - CONFIGDIR="${sysconfdir}" - PRIVATE_DIR="${prefix}/private" - LOCKDIR="${localstatedir}/lock" - PIDDIR="${localstatedir}/run" - STATEDIR="${localstatedir}/locks" - CACHEDIR="${localstatedir}/cache" - LOGFILEBASE="${localstatedir}" - SOCKET_DIR="${localstatedir}/run" - PRIVILEGED_SOCKET_DIR="${localstatedir}/lib" + CONFIGDIR="\${sysconfdir}" + PRIVATE_DIR="\${prefix}/private" + LOCKDIR="\${localstatedir}/lock" + PIDDIR="\${localstatedir}/run" + STATEDIR="\${localstatedir}/locks" + CACHEDIR="\${localstatedir}/cache" + LOGFILEBASE="\${localstatedir}" + SOCKET_DIR="\${localstatedir}/run" + PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib" 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" SWATDIR="${datadir}/samba/swat" CODEPAGEDIR="${datadir}/samba/codepages" PAMMODULESDIR="${libdir}/security" - CONFIGDIR="${sysconfdir}/samba" - PRIVATE_DIR="${localstatedir}/lib/samba/private" - LOCKDIR="${localstatedir}/lock/samba" - PIDDIR="${localstatedir}/run/samba" - STATEDIR="${localstatedir}/lib/samba" - CACHEDIR="${localstatedir}/cache/samba" - LOGFILEBASE="${localstatedir}/log/samba" - SOCKET_DIR="${localstatedir}/run/samba" - PRIVILEGED_SOCKET_DIR="${localstatedir}/lib/samba" + CONFIGDIR="\${sysconfdir}/samba" + PRIVATE_DIR="\${localstatedir}/lib/samba/private" + LOCKDIR="\${localstatedir}/lock/samba" + PIDDIR="\${localstatedir}/run/samba" + STATEDIR="\${localstatedir}/lib/samba" + CACHEDIR="\${localstatedir}/cache/samba" + LOGFILEBASE="\${localstatedir}/log/samba" + SOCKET_DIR="\${localstatedir}/run/samba" + 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 374ede2..517f76e 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,20 @@ dynconfig = { 'STD-PATH': '${DATADIR}/codepages', 'FHS-PATH': '${DATADIR}/samba/codepages', }, + 'PRIVATELIBDIR' : { + 'STD-PATH': '${LIBDIR}/private', + 'FHS-PATH': '${LIBDIR}/samba', + 'OPTION': '--with-privatelibdir', + 'HELPTEXT': 'Which directory to use for private Samba libraries', + 'OVERWRITE': True, + }, + '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 +256,11 @@ def set_options(opt): opt.parser.formatter = SambaIndentedHelpFormatter() opt.parser.formatter.width=Utils.get_term_cols() + for k in ('--with-privatelibdir', '--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','') -- Samba Shared Repository