changeset 73073:bf1ea63459be

(MAIL_USE_FLOCK): Check for HAVE_LIBLOCKFILE too.
author Romain Francoise <romain@orebokech.com>
date Sat, 23 Sep 2006 13:50:32 +0000
parents 623926b10449
children 7e931161a74c
files src/ChangeLog src/s/gnu-linux.h
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Sep 23 09:17:00 2006 +0000
+++ b/src/ChangeLog	Sat Sep 23 13:50:32 2006 +0000
@@ -1,3 +1,7 @@
+2006-09-23  Romain Francoise  <romain@orebokech.com>
+
+	* s/gnu-linux.h (MAIL_USE_FLOCK): Check for HAVE_LIBLOCKFILE too.
+
 2006-09-23  Kenichi Handa  <handa@m17n.org>
 
 	* keymap.c (Fmap_keymap): Docstring mentions about generic
--- a/src/s/gnu-linux.h	Sat Sep 23 09:17:00 2006 +0000
+++ b/src/s/gnu-linux.h	Sat Sep 23 13:50:32 2006 +0000
@@ -142,8 +142,12 @@
    movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and
    HAVE_MAILLOCK_H are defined, so the following appears to be the
    correct logic.  -- fx */
+/* We must check for HAVE_LIBLOCKFILE too, as movemail does.
+   liblockfile is a Free Software replacement for libmail, used on
+   Debian systems and elsewhere. -rfr */
 
-#if !(defined (HAVE_LIBMAIL) && defined (HAVE_MAILLOCK_H))
+#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) &&	\
+      defined (HAVE_MAILLOCK_H))
 #define MAIL_USE_FLOCK
 #endif