Mercurial > emacs
diff configure @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 11 Apr 2007 00:17:47 +0000 |
parents | c0409ee15cee 476a6af9dfd5 |
children | e6fdae9180d4 |
line wrap: on
line diff
--- a/configure Fri Mar 30 02:06:58 2007 +0000 +++ b/configure Wed Apr 11 00:17:47 2007 +0000 @@ -2290,13 +2290,6 @@ 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 ;; @@ -2596,6 +2589,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 @@ -2618,10 +2618,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 ;; @@ -2662,6 +2698,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 ;; @@ -2987,7 +3026,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