From 47a0ee40fc34b0a0a6481886a76a20251a5e9fa9 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 23 Sep 2006 13:50:32 +0000 Subject: [PATCH] (MAIL_USE_FLOCK): Check for HAVE_LIBLOCKFILE too. --- src/ChangeLog | 4 ++++ src/s/gnu-linux.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 + + * s/gnu-linux.h (MAIL_USE_FLOCK): Check for HAVE_LIBLOCKFILE too. + 2006-09-23 Kenichi Handa * 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 -- 2.39.2