summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/doc-txt/ChangeLog5
-rw-r--r--src/OS/os.h-Linux25
-rwxr-xr-xsrc/scripts/os-type6
3 files changed, 26 insertions, 10 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 024f6a5c3..dfe86ab30 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.82 2005/02/17 09:49:08 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.83 2005/02/17 10:04:40 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -389,6 +389,9 @@ Exim version 4.50
83. Patch from Sieve maintainer to fix unterminated string problem in
"vacation" handling.
+84. Some minor changes to the Linux configuration files to help with other
+ OS variants using glibc.
+
----------------------------------------------------
See the note above about the 4.44 and 4.50 releases.
diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 9607c16b6..285e8d28f 100644
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -1,15 +1,28 @@
-/* $Cambridge: exim/src/OS/os.h-Linux,v 1.2 2004/11/12 11:39:34 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-Linux,v 1.3 2005/02/17 10:04:41 ph10 Exp $ */
/* Exim: OS-specific C header file for Linux */
#define CRYPT_H
#define GLIBC_IP_OPTIONS
#define HAVE_MMAP
+#define HAVE_BSD_GETLOADAVG
#define HAVE_SYS_STATVFS_H
#define NO_IP_VAR_H
-#define SIOCGIFCONF_GIVES_ADDR
#define SIG_IGN_WORKS
+#define F_FREESP O_TRUNC
+typedef struct flock flock_t;
+
+#define os_strsignal strsignal
+#define OS_STRSIGNAL
+
+#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
+#define SIOCGIFCONF_GIVES_ADDR
+#define HAVE_SYS_MOUNT_H
+#endif
+
+#if defined(__linux__)
+
/* Some versions of Linux need explicit sync-ing of directories as well as
files. This setting requests that. If the directory is on NFS, it may not
be possible to sync it - in that case, Exim now should ignore the error. But
@@ -22,12 +35,6 @@ storage" as quickly as Exim thinks they are. */
/* Other OS have "const" in here */
#define ICONV_ARG2_TYPE char **
-#define F_FREESP O_TRUNC
-typedef struct flock flock_t;
-
-#define os_strsignal strsignal
-#define OS_STRSIGNAL
-
#define os_find_running_interfaces os_find_running_interfaces_linux
/* Need a prototype for the Linux-specific function. The structure hasn't
@@ -36,4 +43,6 @@ been defined yet, so we need to pre-declare it. */
struct ip_address_item;
extern struct ip_address_item *os_find_running_interfaces_linux(void);
+#endif /* __linux__ */
+
/* End */
diff --git a/src/scripts/os-type b/src/scripts/os-type
index d747ae908..31b5bfcd7 100755
--- a/src/scripts/os-type
+++ b/src/scripts/os-type
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/src/scripts/os-type,v 1.1 2004/10/06 15:07:40 ph10 Exp $
+# $Cambridge: exim/src/scripts/os-type,v 1.2 2005/02/17 10:04:41 ph10 Exp $
# Shell script to determine the operating system type. Some of the heuristics
# herein have accumulated over the years and may not strictly be needed now,
@@ -21,6 +21,10 @@ case "$EXIM_OSTYPE" in ?*) os="$EXIM_OSTYPE";; esac
case "$os" in '') os=`uname -s`;; esac
+# Identify Glibc systems under different names.
+
+case "$os" in GNU|GNU/*|Linux) os=Linux;; esac
+
# It is believed that all systems respond to uname -s, but just in case
# there is one that doesn't, use the shell's $OSTYPE variable. It is known
# to be unhelpful for some systems (under IRIX is it "irix" and under BSDI