NEWS: Encourage nmh-announce subscription. Capitalise `Gmail'.

[nmh] / m4 / locking.m4

diff --git a/m4/locking.m4 b/m4/locking.m4
index b70f225f3bb0e189f3a166d93e5f900bd22d0dfc..f0d4c3122884982d19dba7ad5871fdd9911680e8 100644 (file)
--- a/m4/locking.m4
+++ b/m4/locking.m4
@@ -1,4 +1,3 @@
-dnl

 dnl Our functions to check the locking functions available and select a
 dnl default locking function for the spool file
 dnl
 dnl Our functions to check the locking functions available and select a
 dnl default locking function for the spool file
 dnl


@@ -11,7 +10,7 @@ AC_DEFUN([NMH_LOCKING],
 AS_CASE(["$host_os"],
   [aix*|cygwin*|linux*],
     [default_locktype="fcntl"],
 AS_CASE(["$host_os"],
   [aix*|cygwin*|linux*],
     [default_locktype="fcntl"],

-  [freebsd*|openbsd*|darwin*], [default_locktype="flock"],
+  [freebsd*|*netbsd*|openbsd*|darwin*], [default_locktype="flock"],

   [default_locktype="dot"])
 
 AC_MSG_CHECKING([default locking method for the mail spool])
   [default_locktype="dot"])
 
 AC_MSG_CHECKING([default locking method for the mail spool])


@@ -35,9 +34,17 @@ AS_CASE([$with_locking],
 
 AC_DEFINE_UNQUOTED([DEFAULT_LOCKING], ["$with_locking"],
   [The default lock type for the mail spool file])
 
 AC_DEFINE_UNQUOTED([DEFAULT_LOCKING], ["$with_locking"],
   [The default lock type for the mail spool file])

+AC_SUBST([default_locking], [$with_locking])

 
 AC_MSG_RESULT([$with_locking])
 
 
 AC_MSG_RESULT([$with_locking])
 

+supported_locks="fcntl dot"
+AS_IF([test x"$ac_cv_func_flock" = x"yes"],
+  [supported_locks="$supported_locks flock"])
+AS_IF([test x"$ac_cv_func_lockf" = x"yes"],
+  [supported_locks="$supported_locks lockf"])
+AC_SUBST([supported_locks])
+

 dnl Should we use a locking directory?
 AC_ARG_ENABLE([lockdir],
   [AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [
 dnl Should we use a locking directory?
 AC_ARG_ENABLE([lockdir],
   [AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [