Move MAIL_USE_FLOCK, MAIL_USE_LOCKF, BLESSMAIL_TARGET from cpp to configure.

* configure.in (MAIL_USE_FLOCK, MAIL_USE_LOCKF): New AC_DEFINEs.
(BLESSMAIL_TARGET): New output variable.

* lib-src/Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp.

* src/s/aix4-2.h (MAIL_USE_LOCKF):
* src/s/bsd-common.h (MAIL_USE_FLOCK):
* src/s/darwin.h (MAIL_USE_FLOCK):
* src/s/gnu-linux.h (MAIL_USE_FLOCK):
* src/s/irix6-5.h (MAIL_USE_FLOCK):
* src/s/template.h (MAIL_USE_FLOCK):
Move to configure.

* src/s/ms-w32.h: Comment.

* msdos/sed3v2.inp (BLESSMAIL_TARGET): Edit to need-blessmail.

2 files changed, 6 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9de05124720..c2a7b6f9ce3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp.
+
 2010-05-08  Christoph  <cschol2112@googlemail.com>  (tiny change)
 
         * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 73953211cd4..cde26a5411f 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -131,8 +131,8 @@ EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 # If neither flag is set, blessmail is used.
 MOVE_FLAGS=
 
-## May be reset below by cpp.
-BLESSMAIL_TARGET=
+## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail.
+BLESSMAIL_TARGET=@BLESSMAIL_TARGET@
 
 ## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4
 KRB4LIB=@KRB4LIB@
@@ -173,12 +173,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src
 #endif
 LOADLIBES=LIBS_SYSTEM
 
-#ifndef MAIL_USE_FLOCK
-#ifndef MAIL_USE_LOCKF
-BLESSMAIL_TARGET = need-blessmail
-#endif
-#endif
-
 
 .SUFFIXES: .m