diff options
| -rw-r--r-- | source4/build/m4/check_path.m4 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index d67671c5a4..789f445797 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -11,6 +11,14 @@ dnl # ones... AC_PREFIX_DEFAULT(/usr/local/samba) +# Defaults and --without-fhs + configdir="\${LIBDIR}" + logfilebase="\${localstatedir}" + lockdir="\${localstatedir}/locks" + piddir="\${localstatedir}/locks" + privatedir="\${prefix}/private" + swatdir="\${prefix}/swat" + AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], configdir="${sysconfdir}/samba" @@ -19,13 +27,7 @@ AC_ARG_WITH(fhs, logfilebase="\${localstatedir}/log/samba" privatedir="\${CONFIGDIR}/private" libdir="\${prefix}/lib/samba" - swatdir="\${datadir}/samba/swat", - configdir="\${LIBDIR}" - logfilebase="\${localstatedir}" - lockdir="\${localstatedir}/locks" - piddir="\${localstatedir}/locks" - privatedir="\${prefix}/private" - swatdir="\${prefix}/swat") + swatdir="\${datadir}/samba/swat") ################################################# # set private directory location |