diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-26 05:05:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:29 -0500 |
| commit | b2050691a751f4688098b4a747acd805e4776ba1 (patch) | |
| tree | 1619c82bd8e1e1d94a42f2e1343291c77c0b19c4 | |
| parent | 3b0b7cb72385c5fed40c63971dfb1eab79e7741a (diff) | |
| download | samba-b2050691a751f4688098b4a747acd805e4776ba1.tar.gz samba-b2050691a751f4688098b4a747acd805e4776ba1.tar.bz2 samba-b2050691a751f4688098b4a747acd805e4776ba1.zip | |
r13152: Jelmer assures me that this won't break anything, but does make it
much clearer where things go.
Andrew Bartlett
(This used to be commit 655076d51b9213a8dba348c10c044f27709b61c6)
| -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 |