summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-30 16:41:21 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-30 16:41:21 +0200
commite0af9601e1535b847e3c82e334d6a9de2ff3580d (patch)
treedd73c9bd3176c106b58877a37312a91c5caff0ef /source4
parent3d8323fbff85709ab64ea039044a555975821b7f (diff)
downloadsamba-e0af9601e1535b847e3c82e334d6a9de2ff3580d.tar.gz
samba-e0af9601e1535b847e3c82e334d6a9de2ff3580d.tar.bz2
samba-e0af9601e1535b847e3c82e334d6a9de2ff3580d.zip
Fix FHS flag, rename to --enable-fhs since it's a feature flag
and doesn't take any arguments.
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_path.m419
1 files changed, 12 insertions, 7 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 51d5daa913..666dd3b0ae 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -23,13 +23,13 @@ winbindd_socket_dir="${localstatedir}/run/winbindd"
winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged"
ntp_signd_socket_dir="${localstatedir}/run/ntp_signd"
-# Check to prevent installing directly under /usr without the FHS
-AS_IF([test ${prefix} == /usr],[
- AC_MSG_ERROR([Don't install directly under "/usr" without using the FHS option (--with-fhs). This could lead to file loss!])
-])
+AC_ARG_ENABLE(fhs,
+[AS_HELP_STRING([--enable-fhs],[Use FHS-compliant paths (default=no)])],
+[fhs=$enableval],
+[fhs=no]
+)
-AC_ARG_WITH(fhs,
-[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
+if test x$fhs = xyes; then
lockdir="${localstatedir}/lib/samba"
piddir="${localstatedir}/run/samba"
logfilebase="${localstatedir}/log/samba"
@@ -41,7 +41,12 @@ AC_ARG_WITH(fhs,
ntp_signd_socket_dir="${localstatedir}/run/samba/ntp_signd"
winbindd_socket_dir="${localstatedir}/run/samba/winbindd"
winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged"
-)
+else
+ # Check to prevent installing directly under /usr without the FHS
+ AS_IF([test $prefix == /usr || $prefix == /usr/local],[
+ AC_MSG_ERROR([Don't install directly under "/usr" or "/usr/local" without using the FHS option (--enable-fhs). This could lead to file loss!])
+ ])
+fi
#################################################
# set private directory location