Applied Michael Haardt's HP-UX patch.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dcd09ded6c39ac56a0c6676105121be1607f7b64..ffcb6e17b7fc3b7d616ba2377d3af74968543c67 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.159 2005/06/16 20:02:42 tom Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.160 2005/06/17 09:02:40 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -140,6 +140,9 @@ TK/09 Added "prvs" and "prvscheck" expansion items. These help a lot with
       implementing BATV in an Exim configuration. See NewStuff for the gory
       details.
 
+PH/17 Applied Michael Haardt's patch for HP-UX, affecting only the os.h and
+      Makefile that are specific to HP-UX.
+
 
 Exim version 4.51
 -----------------

diff --git a/src/OS/Makefile-HP-UX b/src/OS/Makefile-HP-UX
index a5d5374c3b6106839682b449dbe2957f330259f7..7b77b1002f1adb2e00a3cbb2d5e616f15c5e1f89 100644 (file)
--- a/src/OS/Makefile-HP-UX
+++ b/src/OS/Makefile-HP-UX
@@ -1,8 +1,13 @@
-# $Cambridge: exim/src/OS/Makefile-HP-UX,v 1.1 2004/10/06 15:07:39 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-HP-UX,v 1.2 2005/06/17 09:02:40 ph10 Exp $
 
 # Exim: OS-specific make file for HP-UX later than 9
 
-CFLAGS=-O
+# HP ANSI C compiler
+#CC=cc
+#CFLAGS=+O1 +Onolimit -z -D_XOPEN_SOURCE_EXTENDED
+# gcc
+CFLAGS=-O -Wl,-z -D_XOPEN_SOURCE_EXTENDED
+
 BASENAME_COMMAND=/bin/basename
 HAVE_ICONV=yes
 HAVE_SETRESUID=YES

diff --git a/src/OS/os.h-HP-UX b/src/OS/os.h-HP-UX
index 027cf92300fec324fbccb3515cbccd51851592ed..20408151e58f934fa504af3ce17cfe9ade406c26 100644 (file)
--- a/src/OS/os.h-HP-UX
+++ b/src/OS/os.h-HP-UX
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/OS/os.h-HP-UX,v 1.2 2005/05/03 14:22:12 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-HP-UX,v 1.3 2005/06/17 09:02:40 ph10 Exp $ */
 
 /* Exim: OS-specific C header file for HP-UX versions greater than 9 */
 
@@ -9,7 +9,7 @@
 #define HAVE_DEV_KMEM
 #define LOAD_AVG_TYPE   double
 #define LOAD_AVG_SYMBOL "avenrun"
-#define KERNEL_PATH     "/hp-ux"
+#define KERNEL_PATH     "/stand/vmunix"
 #define FSCALE          1.0
 
 #define HAVE_SYS_STATVFS_H