# HG changeset patch
# User cvs
# Date 1186988403 -7200
# Node ID 0b7f3b634cf21cc1c9b34c6bd48e1a803359c92e
# Parent  6aaf555c2ec803240bf5920bc84bda15104886a4
Import from CVS: tag r19-16-pre9

diff -r 6aaf555c2ec8 -r 0b7f3b634cf2 CHANGES-beta
--- a/CHANGES-beta	Mon Aug 13 08:59:45 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 09:00:03 2007 +0200
@@ -1,4 +1,7 @@
 							-*- indented-text -*-
+to 19.16 -- "Lille"
+-- Really apply the Irix build fix
+
 to 19.16 -- "Nancy"
 -- about.el touch up, new faces, new entries
 -- BSD build fix
diff -r 6aaf555c2ec8 -r 0b7f3b634cf2 configure
--- a/configure	Mon Aug 13 08:59:45 2007 +0200
+++ b/configure	Mon Aug 13 09:00:03 2007 +0200
@@ -2083,7 +2083,7 @@
   ;;
   mips-sgi-irix6* )
     machine=iris4d opsys=irix6-0
-    NON_GNU_CPP=/lib/cpp
+    NON_GNU_CPP="cc -cckr -E"
   ;;
   mips-sgi-irix5.[3-9]* )
     machine=iris4d opsys=irix5-3
diff -r 6aaf555c2ec8 -r 0b7f3b634cf2 configure.in
--- a/configure.in	Mon Aug 13 08:59:45 2007 +0200
+++ b/configure.in	Mon Aug 13 09:00:03 2007 +0200
@@ -2089,7 +2089,7 @@
   ;;
   mips-sgi-irix6* )
     machine=iris4d opsys=irix6-0
-    NON_GNU_CPP=/lib/cpp
+    NON_GNU_CPP="cc -cckr -E"
   ;;
   mips-sgi-irix5.[3-9]* )
     machine=iris4d opsys=irix5-3
diff -r 6aaf555c2ec8 -r 0b7f3b634cf2 lisp/version.el
--- a/lisp/version.el	Mon Aug 13 08:59:45 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 09:00:03 2007 +0200
@@ -55,7 +55,7 @@
   "Non-nil when this is a test (beta) version of XEmacs.
 Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
-(defconst xemacs-codename "Nancy"
+(defconst xemacs-codename "Lille"
   "Symbolic name of XEmacs build.
 Warning, this variable did not exist in XEmacs versions prior to 19.16
 and 20.3")