[SCM] Samba Shared Repository - branch master updated - e0af9601e1535b847e3c82e334d6a9de2ff3580d

[Jelmer Vernooij]

The branch, master has been updated
       via  e0af9601e1535b847e3c82e334d6a9de2ff3580d (commit)
      from  3d8323fbff85709ab64ea039044a555975821b7f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e0af9601e1535b847e3c82e334d6a9de2ff3580d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 30 16:41:21 2008 +0200

    Fix FHS flag, rename to --enable-fhs since it's a feature flag
    and doesn't take any arguments.

-----------------------------------------------------------------------

Summary of changes:
 source4/build/m4/check_path.m4 |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 51d5daa..666dd3b 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


-- 
Samba Shared Repository