From a10029b854a7bfb536b9ed1cd0c4383f9ff8b3c0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 14 Jun 2011 15:00:32 +1000 Subject: [PATCH] s3-autconf Move nmbd socket directory to PREFIX/var/nmbd This is consistent with the new ncalrpc socket directory, also added in this release. Andrew Bartlett Signed-off-by: Andrew Tridgell The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden name PREFIX/var/nmbd). (cherry picked from commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d) --- source3/m4/check_path.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index f04e6f89c0f..65db076ee61 100644 --- a/source3/m4/check_path.m4 +++ b/source3/m4/check_path.m4 @@ -19,7 +19,7 @@ rootsbindir="\${SBINDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" ncalrpcdir="\${VARDIR}/ncalrpc" -nmbdsocketdir="${lockdir}/.nmbd" +nmbdsocketdir="\${VARDIR}/nmbd" test "${mandir}" || mandir="\${prefix}/man" logfilebase="\${VARDIR}" privatedir="\${prefix}/private" @@ -169,7 +169,7 @@ AC_ARG_WITH(ncalrpcdir, ################################################# # set nmbd socket directory location AC_ARG_WITH(nmbdsocketdir, -[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory (${lockdir}/.nmbd)])], +[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory ($ac_default_prefix/var/nmbd)])], [ case "$withval" in yes|no) # -- 2.11.4.GIT