Fix Tim's fix for #1144. Tim, could you look at that again?

With only your fix in for example smb.conf was expected in /smb.conf...

Thanks,

Volker

diff --git a/source/configure.in b/source/configure.in
index 9fffe7c3c6e6c61eb68ba7dc865f5e4f0f7f04e0..d07baf12102f93e802683fc651a2dc0527f55323 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -14,6 +14,15 @@ AC_ENABLE_SHARED
 # ones...
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
+lockdir="\${VARDIR}/locks"
+piddir="\${VARDIR}/locks"
+mandir="\${prefix}/man"
+logfilebase="\${VARDIR}"
+privatedir="\${prefix}/private"
+libdir="\${prefix}/lib"
+configdir="\${LIBDIR}"
+swatdir="\${prefix}/swat"
+
 AC_ARG_WITH(fhs, 
 [  --with-fhs              Use FHS-compliant paths (default=no)],
 [ case "$withval" in
@@ -25,16 +34,12 @@ AC_ARG_WITH(fhs,
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     libdir="\${prefix}/lib/samba"
-    swatdir="\${DATADIR}/samba/swat",
-    configdir="\${LIBDIR}"
-    logfilebase="\${VARDIR}"
-    lockdir="\${VARDIR}/locks"
-    piddir="\${VARDIR}/locks"
-    privatedir="\${prefix}/private"
-    swatdir="\${prefix}/swat"
+    swatdir="\${LIBDIR}/samba/swat"
     ;;
   esac])
 
+lmhostsfile="\${CONFIGDIR}/lmhosts"
+
 #################################################
 # set private directory location
 AC_ARG_WITH(privatedir,