summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2011-06-02 18:17:49 -0700
committerTim Rice <tim@multitalents.net>2011-06-02 18:17:49 -0700
commit90f42b07058d0813e258db90ccdd5da839844d19 (patch)
treedf11ed37c6f7d7e8984d621cc42c8a22f48b5d96 /defines.h
parentc412c1567b6d9eac77bbb43f450b95ef47389ad1 (diff)
- (tim) [configure.ac defines.h] Run test program to detect system mail
directory. Add --with-maildir option to override. Fixed OpenServer 6 getting it wrong. Fixed many systems having MAIL=/var/mail//username ok dtucker
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/defines.h b/defines.h
index a435de76..e4ccc540 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.166 2011/05/05 06:06:59 tim Exp $ */
+/* $Id: defines.h,v 1.167 2011/06/03 01:17:49 tim Exp $ */
/* Constants */
@@ -389,18 +389,15 @@ struct winsize {
# define _PATH_DEVNULL "/dev/null"
#endif
-#ifndef MAIL_DIRECTORY
-# define MAIL_DIRECTORY "/var/spool/mail"
-#endif
+/* user may have set a different path */
+#if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY)
+# undef _PATH_MAILDIR MAILDIR
+#endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */
-#ifndef MAILDIR
-# define MAILDIR MAIL_DIRECTORY
+#ifdef MAIL_DIRECTORY
+# define _PATH_MAILDIR MAIL_DIRECTORY
#endif
-#if !defined(_PATH_MAILDIR) && defined(MAILDIR)
-# define _PATH_MAILDIR MAILDIR
-#endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
-
#ifndef _PATH_NOLOGIN
# define _PATH_NOLOGIN "/etc/nologin"
#endif