Update AIX configuration file as per Mike Meredith's message.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9941ed9ec6be13655d59297e57ea435eb3a52879..b01485f83c49786c3b11d515ffddd162463cc3fe 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.80 2005/02/16 16:28:36 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.81 2005/02/16 16:40:22 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -384,6 +384,8 @@ Exim version 4.50
 81. Included the latest eximstats from Steve (adds average sizes to HTML Top
     tables).
 
 81. Included the latest eximstats from Steve (adds average sizes to HTML Top
     tables).
 

+82. Updated OS/Makefile-AIX as per message from Mike Meredith.
+

 
 ----------------------------------------------------
 See the note above about the 4.44 and 4.50 releases.
 
 ----------------------------------------------------
 See the note above about the 4.44 and 4.50 releases.

diff --git a/src/OS/Makefile-AIX b/src/OS/Makefile-AIX
index 42659a6cde64b8817f39abfa0fba246bee71359c..489ffe3b125b91ba36a8b73e095060457754860a 100644 (file)
--- a/src/OS/Makefile-AIX
+++ b/src/OS/Makefile-AIX
@@ -1,23 +1,27 @@
-# $Cambridge: exim/src/OS/Makefile-AIX,v 1.1 2004/10/06 15:07:39 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-AIX,v 1.2 2005/02/16 16:40:22 ph10 Exp $

 
 # Exim: OS-specific make file for AIX
 # Written by Nick Waterman (nick@cimio.co.uk)
 
 # Exim: OS-specific make file for AIX
 # Written by Nick Waterman (nick@cimio.co.uk)

+# Modified by PH following a message from Mike Meredith

 
 # Note that the output of uname -m is probably not what Philip expected,
 # so you might end up with more build-AIX-random_number directories than
 # you expected if you have too many AIX boxes, but it seems to work... I
 # blame IBM.
 
 
 # Note that the output of uname -m is probably not what Philip expected,
 # so you might end up with more build-AIX-random_number directories than
 # you expected if you have too many AIX boxes, but it seems to work... I
 # blame IBM.
 

-# Note that nowadays you have to pay extra for a compiler with AIX!
+# Note that nowadays you have to pay extra for a cc compiler with AIX!

 
 

-CC=cc
+CC=gcc

 
 # This needs to be in here rather than os.h-AIX because of regexp stuff.
 # basically strchr is a #define, which means "extern char *strchr()"
 # ruins things. __STR31__ seems to get around this by magic. The AIX
 # include files are quite a confusing maze.
 
 # This needs to be in here rather than os.h-AIX because of regexp stuff.
 # basically strchr is a #define, which means "extern char *strchr()"
 # ruins things. __STR31__ seems to get around this by magic. The AIX
 # include files are quite a confusing maze.

+# Mike M says this is not necessary any more; possibly this is related to
+# using gcc. Commented out by PH.
+#CFLAGS = -D__STR31__

 
 

-CFLAGS = -D__STR31__
+CFLAGS = -mcpu=power4 -maix64 -O3

 
 # Needed for vfork() and vfork() only?
 
 
 # Needed for vfork() and vfork() only?