2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b08fde7317e..12a6ef0dd1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 817f1facdee..55d9a725293 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -142,8 +142,12 @@ Boston, MA 02110-1301, USA.  */
    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