Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-674
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-675
   Update from CVS

 * [email protected]/emacs--devo--0--patch-676
   Update from CVS

 * [email protected]/emacs--devo--0--patch-677
   Update from CVS

 * [email protected]/emacs--devo--0--patch-678
   Update from CVS

 * [email protected]/emacs--devo--0--patch-679
   Update from CVS

 * [email protected]/emacs--devo--0--patch-680
   Update from CVS

 * [email protected]/emacs--devo--0--patch-681
   Update from CVS

 * [email protected]/emacs--devo--0--patch-682
   Update from CVS

 * [email protected]/emacs--devo--0--patch-683
   Update from CVS

 * [email protected]/emacs--devo--0--patch-684
   Update from CVS

 * [email protected]/emacs--devo--0--patch-685
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-686
   Update from CVS

 * [email protected]/emacs--devo--0--patch-687
   Release ERC 5.2.

 * [email protected]/emacs--devo--0--patch-688
   Update from CVS

 * [email protected]/emacs--devo--0--patch-689
   Update from CVS

 * [email protected]/emacs--devo--0--patch-690
   Update from CVS

 * [email protected]/emacs--devo--0--patch-691
   Update from CVS

 * [email protected]/emacs--devo--0--patch-692
   Update from CVS

 * [email protected]/emacs--devo--0--patch-693
   Update from CVS

 * [email protected]/emacs--devo--0--patch-694
   Update from CVS

 * [email protected]/emacs--devo--0--patch-695
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-696
   Update from CVS

 * [email protected]/emacs--devo--0--patch-697
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-698
   Update from CVS

 * [email protected]/emacs--devo--0--patch-699
   Update from CVS

 * [email protected]/emacs--devo--0--patch-700
   Update from CVS

 * [email protected]/emacs--devo--0--patch-701
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-209
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-210
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-211
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-212
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-213
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-214
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-215
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-601

1 files changed, 52 insertions, 8 deletions

diff --git a/configure b/configure
index 2ea6ff80b0..2946bf89a0 100755
--- a/configure
+++ b/configure
@@ -2260,13 +2260,6 @@ _ACEOF
       sparc*-*-openbsd*)       machine=sparc ;;
       vax-*-openbsd*)          machine=vax ;;
       x86_64-*-openbsd*)       machine=amdx86-64 ;;
-      i386-*-openbsd*)	machine=intel386 ;;
-      x86_64-*-openbsd*)    machine=amdx86-64 ;;
-      m68k-*-openbsd*)  machine=hp9000s300 ;;
-      mipsel-*-openbsd*) machine=pmax ;;
-      ns32k-*-openbsd*)	machine=ns32000 ;;
-      sparc-*-openbsd*)	machine=sparc ;;
-      vax-*-openbsd*)	machine=vax ;;
     esac
   ;;
 
@@ -2566,6 +2559,13 @@ _ACEOF
     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
@@ -2588,10 +2588,46 @@ _ACEOF
     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
   ;;
@@ -2632,6 +2668,9 @@ _ACEOF
   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
   ;;
@@ -2957,7 +2996,12 @@ _ACEOF
 		;;
       *-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