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 <tridge@samba.org>
The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden
name PREFIX/var/nmbd).
(cherry picked from commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d)

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index f04e6f89c0fb4941692fc28c3eadc52809bc4ab8..65db076ee61a00ed2cd856821b8d775ba60b8329 100644 (file)
--- 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)
   #