From b63df57731cb5aa903590e997945b613e5c3b283 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Tue, 13 Dec 1994 14:49:17 +0000
Subject: [PATCH] (rs6000-ibm-aix4.1*): New alternative. (rs6000-ibm-aix4*):
 New alternative.

For SVR4.2, set NON_GNU_CPP if not already set.
---
 configure.in | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index fa79f7ae868..31267bdba25 100644
--- a/configure.in
+++ b/configure.in
@@ -406,6 +406,12 @@ case "${canonical}" in
   rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 )
     machine=ibmrs6000 opsys=aix3-2-5
   ;;
+  rs6000-ibm-aix4.1* | powerpc-ibm-aix4.1*  )
+    machine=ibmrs6000 opsys=aix4-1
+  ;;
+  rs6000-ibm-aix4* | powerpc-ibm-aix4*  )
+    machine=ibmrs6000 opsys=aix4
+  ;;
   rs6000-ibm-aix* | powerpc-ibm-aix* )
     machine=ibmrs6000 opsys=aix3-2
   ;;
@@ -772,7 +778,11 @@ if test x"${opsys}" = x; then
     *-sysv4.1 | *-sysvr4.1 )
 	NON_GNU_CPP=/usr/lib/cpp
 	opsys=usg5-4 ;;
-    *-sysv4.2 | *-sysvr4.2 )		opsys=usg5-4-2 ;;
+    *-sysv4.2 | *-sysvr4.2 )
+	if [ x$NON_GNU_CPP = x ]; then
+	  NON_GNU_CPP=/usr/ccs/lib/cpp
+	fi
+	opsys=usg5-4-2 ;;
     * )
       unported=yes
     ;;
@@ -1261,7 +1271,7 @@ changequote([, ])dnl
 AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile \
 	man/Makefile lwlib/Makefile src/Makefile.in, [
 
-### Make necessary directories, if they don't exist.
+### Make the necessary directories, if they don't exist.
 for dir in cpp etc ; do
   test -d ${dir} || mkdir ${dir}
 done
-- 
2.39.5