diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-09 17:07:47 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-09 17:07:47 -0700 |
| commit | 7490175bc38099aa093715116b8d96e7319e7ca4 (patch) | |
| tree | 783ea2f527709ca56d1da6cfed56fca2832607aa /lib-src/Makefile.in | |
| parent | 79ccd68f683c1e46bc5dcc12f5b232a75a42ea88 (diff) | |
| download | emacs-7490175bc38099aa093715116b8d96e7319e7ca4.tar.gz | |
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.
Diffstat (limited to 'lib-src/Makefile.in')
| -rw-r--r-- | lib-src/Makefile.in | 10 |
1 files changed, 2 insertions, 8 deletions
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 |