diff configure.in @ 83561:dc002877ce12

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-674 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-675 Update from CVS * [e-mail]/emacs--devo--0--patch-676 Update from CVS * [e-mail]/emacs--devo--0--patch-677 Update from CVS * [e-mail]/emacs--devo--0--patch-678 Update from CVS * [e-mail]/emacs--devo--0--patch-679 Update from CVS * [e-mail]/emacs--devo--0--patch-680 Update from CVS * [e-mail]/emacs--devo--0--patch-681 Update from CVS * [e-mail]/emacs--devo--0--patch-682 Update from CVS * [e-mail]/emacs--devo--0--patch-683 Update from CVS * [e-mail]/emacs--devo--0--patch-684 Update from CVS * [e-mail]/emacs--devo--0--patch-685 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-686 Update from CVS * [e-mail]/emacs--devo--0--patch-687 Release ERC 5.2. * [e-mail]/emacs--devo--0--patch-688 Update from CVS * [e-mail]/emacs--devo--0--patch-689 Update from CVS * [e-mail]/emacs--devo--0--patch-690 Update from CVS * [e-mail]/emacs--devo--0--patch-691 Update from CVS * [e-mail]/emacs--devo--0--patch-692 Update from CVS * [e-mail]/emacs--devo--0--patch-693 Update from CVS * [e-mail]/emacs--devo--0--patch-694 Update from CVS * [e-mail]/emacs--devo--0--patch-695 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-696 Update from CVS * [e-mail]/emacs--devo--0--patch-697 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-698 Update from CVS * [e-mail]/emacs--devo--0--patch-699 Update from CVS * [e-mail]/emacs--devo--0--patch-700 Update from CVS * [e-mail]/emacs--devo--0--patch-701 Update from CVS * [e-mail]/gnus--rel--5.10--patch-209 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-210 Update from CVS * [e-mail]/gnus--rel--5.10--patch-211 Update from CVS * [e-mail]/gnus--rel--5.10--patch-212 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-213 Update from CVS * [e-mail]/gnus--rel--5.10--patch-214 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-215 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-601

--- a/configure.in	Sun Apr 22 12:12:29 2007 +0000
+++ b/configure.in	Sun Apr 22 12:42:47 2007 +0000
@@ -593,6 +593,13 @@
     machine=nh6000 opsys=powerunix
     NON_GNU_CPP="cc -Xo -E -P"
   ;;
+  ## SR2001/SR2201 running HI-UX/MPP
+  hppa1.1-hitachi-hiuxmpp* )
+    machine=sr2k opsys=hiuxmpp
+  ;;
+  hppa1.1-hitachi-hiuxwe2* )
+    machine=sr2k opsys=hiuxwe2
+  ;;
   ## Honeywell XPS100
   xps*-honeywell-sysv* )
     machine=xps100 opsys=usg5-2
@@ -615,10 +622,46 @@
     esac
   ;;
 
+  ## HP 9000 series 700 and 800, running HP/UX
+  hppa*-hp-hpux7* )
+    machine=hp800 opsys=hpux
+  ;;
+  hppa*-hp-hpux8* )
+    machine=hp800 opsys=hpux8
+  ;;
+  hppa*-hp-hpux9shr* )
+    machine=hp800 opsys=hpux9shr
+  ;;
+  hppa*-hp-hpux9* )
+    machine=hp800 opsys=hpux9
+  ;;
+  hppa*-hp-hpux10.2* )
+    machine=hp800 opsys=hpux10-20
+  ;;
+  hppa*-hp-hpux10* )
+    machine=hp800 opsys=hpux10
+  ;;
+  hppa*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+    CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
+  ;;
+
   hppa*-*-linux-gnu* )
     machine=hp800 opsys=gnu-linux
   ;;
 
+  ## HP 9000 series 700 and 800, running HP/UX
+  hppa*-hp-hpux* )
+    ## Cross-compilation?  Nah!
+    case "`uname -r`" in
+      ## Someone's system reports A.B8.05 for this.
+      ## I wonder what other possibilities there are.
+      *.B8.* ) machine=hp800 opsys=hpux8 ;;
+      *.08.* ) machine=hp800 opsys=hpux8 ;;
+      *.09.* ) machine=hp800 opsys=hpux9 ;;
+      *) machine=hp800 opsys=hpux10 ;;
+    esac
+  ;;
   hppa*-*-nextstep* )
     machine=hp800 opsys=nextstep
   ;;
@@ -659,6 +702,9 @@
   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
+  rs6000-ibm-aix4.3* | powerpc-ibm-aix4.3*  )
+    machine=ibmrs6000 opsys=aix4-2
+  ;;
   rs6000-ibm-aix5* | powerpc-ibm-aix5*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
@@ -984,7 +1030,12 @@
 		;;
       *-sunos5* | *-solaris* )
 		opsys=sol2-6
-		NON_GNU_CPP=/usr/ccs/lib/cpp
+		if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then
+		  ## -Xs prevents spurious whitespace.
+		  NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs"
+		else
+		  NON_GNU_CPP=/usr/ccs/lib/cpp
+		fi
 		;;
       *			  ) opsys=bsd4-2   ;;
     esac