configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default with-fhs.

This is what one actually wants:
Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba.

Michael
(cherry picked from commit 03de8c1955a85f2e3e9f947309e09023138a1591)
(cherry picked from commit bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477)

diff --git a/source/m4/check_path.m4 b/source/m4/check_path.m4
index ce512a6d72db9cf103edec9f37688d024de4afae..7aa8c213e07faf8bd12756d69d5a8da34e1775b3 100644 (file)
--- a/source/m4/check_path.m4
+++ b/source/m4/check_path.m4
@@ -39,8 +39,8 @@ AC_ARG_WITH(fhs,
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
-    test "${libdir}" || libdir="\${prefix}/lib/samba"
-    modulesdir="${libdir}"
+    test "${libdir}" || libdir="\${prefix}/lib"
+    modulesdir="${libdir}/samba"
     configdir="\${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"
     codepagedir="\${MODULESDIR}"