1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00

Regenerate.

This commit is contained in:
Andreas Schwab 2008-01-17 11:43:28 +00:00
parent ea7a608ab9
commit 55e6d9b27e
4 changed files with 19 additions and 507 deletions

View File

@ -1,3 +1,8 @@
2008-01-17 Andreas Schwab <schwab@suse.de>
* configure.in (HAVE_LIB64_DIR): Renamed from
HAVE_X86_64_LIB64_DIR.
2008-01-17 Glenn Morris <rgm@gnu.org>
* configure.in (HAVE_X86_64_LIB64_DIR): Also set on s390x systems.

509
configure vendored
View File

@ -2235,8 +2235,8 @@ configuration=${host_alias-${build_alias-$host}}
### based on the machine portion of the configuration name, and an s-
### file based on the operating system portion. However, it turns out
### that each m/*.h file is pretty manufacturer-specific - for
### example, apollo.h, hp9000s300.h, mega68k, news.h, and tad68k are
### all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS
### example hp9000s300.h is a 68000 machine;
### mips.h, pmax.h are all MIPS
### machines. So we basically have to have a special case for each
### configuration name.
###
@ -2299,14 +2299,12 @@ _ACEOF
mips-*-netbsd*) machine=pmax ;;
mipsel-*-netbsd*) machine=pmax ;;
mipseb-*-netbsd*) machine=pmax ;;
ns32k-*-netbsd*) machine=ns32000 ;;
powerpc-*-netbsd*) machine=macppc ;;
sparc*-*-netbsd*) machine=sparc ;;
vax-*-netbsd*) machine=vax ;;
arm-*-netbsd*) machine=arm ;;
x86_64-*-netbsd*) machine=amdx86-64 ;;
hppa-*-netbsd*) machine=hp800 ;;
shle-*-netbsd*) machine=sh3el ;;
esac
;;
@ -2319,10 +2317,8 @@ _ACEOF
hppa-*-openbsd*) machine=hp9000s300 ;;
i386-*-openbsd*) machine=intel386 ;;
m68k-*-openbsd*) machine=hp9000s300 ;;
m88k-*-openbsd*) machine=aviion ;;
mips64-*-openbsd*) machine=mips64 ;;
powerpc-*-openbsd*) machine=macppc ;;
sh-*-openbsd*) machine=sh3el ;;
sparc*-*-openbsd*) machine=sparc ;;
vax-*-openbsd*) machine=vax ;;
x86_64-*-openbsd*) machine=amdx86-64 ;;
@ -2338,16 +2334,6 @@ _ACEOF
esac
;;
## Acorn RISCiX:
arm-acorn-riscix1.1* )
machine=acorn opsys=riscix1-1
;;
arm-acorn-riscix1.2* | arm-acorn-riscix )
## This name is riscix12 instead of riscix1.2
## to avoid a file name conflict on MSDOS.
machine=acorn opsys=riscix12
;;
## BSDI ports
*-*-bsdi* )
opsys=bsdi
@ -2365,19 +2351,6 @@ _ACEOF
esac
;;
## Alliant machines
## Strictly speaking, we need the version of the alliant operating
## system to choose the right machine file, but currently the
## configuration name doesn't tell us enough to choose the right
## one; we need to give alliants their own operating system name to
## do this right. When someone cares, they can help us.
fx80-alliant-* )
machine=alliant4 opsys=bsd4-2
;;
i860-alliant-* )
machine=alliant-2800 opsys=bsd4-3
;;
## Alpha (DEC) machines.
alpha*-dec-osf* )
machine=alpha opsys=osf1
@ -2403,21 +2376,6 @@ _ACEOF
machine=arm opsys=gnu-linux
;;
## Altos 3068
m68*-altos-sysv* )
machine=altos opsys=usg5-2
;;
## Amdahl UTS
580-amdahl-sysv* )
machine=amdahl opsys=usg5-2-2
;;
## Apollo, Domain/OS
m68*-apollo-* )
machine=apollo opsys=bsd4-3
;;
## Apple Darwin / Mac OS X
*-apple-darwin* )
case "${canonical}" in
@ -2436,101 +2394,16 @@ _ACEOF
fi
;;
## AT&T 3b2, 3b5, 3b15, 3b20
we32k-att-sysv* )
machine=att3b opsys=usg5-2-2
;;
## AT&T 3b1 - The Mighty Unix PC!
m68*-att-sysv* )
machine=7300 opsys=usg5-2-2
;;
## Bull dpx20
rs6000-bull-bosx* )
machine=ibmrs6000 opsys=aix3-2
;;
## Bull dpx2
m68*-bull-sysv3* )
machine=dpx2 opsys=usg5-3
;;
## Bull sps7
m68*-bull-sysv2* )
machine=sps7 opsys=usg5-2
;;
## CCI 5/32, 6/32 -- see "Tahoe".
## Celerity
## I don't know what configuration name to use for this; config.sub
## doesn't seem to know anything about it. Hey, Celerity users, get
## in touch with us!
celerity-celerity-bsd* )
machine=celerity opsys=bsd4-2
;;
## Clipper
## What operating systems does this chip run that Emacs has been
## tested on?
clipper-* )
machine=clipper
## We'll use the catch-all code at the bottom to guess the
## operating system.
;;
## Compaq Nonstop
mips-compaq-nonstopux* )
machine=nonstopux opsys=nonstopux
;;
## Convex
*-convex-bsd* | *-convex-convexos* )
machine=convex opsys=bsd4-3
## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov
NON_GNU_CPP="cc -E -P"
;;
## Cubix QBx/386
i[3456]86-cubix-sysv* )
machine=intel386 opsys=usg5-3
;;
## Cydra 5
cydra*-cydrome-sysv* )
machine=cydra5 opsys=usg5-3
;;
## Data General AViiON Machines
## DG changed naming conventions with the release of 5.4.4.10, they
## dropped the initial 5.4 but left the intervening R. Because of the
## R this shouldn't conflict with older versions of the OS (which I
## think were named like dgux4.*). In addition, DG new AViiONs series
## uses either Motorola M88k or Intel Pentium CPUs.
m88k-dg-dguxR4.* | m88k-dg-dgux4* )
machine=aviion opsys=dgux4
;;
m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* )
## This name is dgux5-4-3 instead of dgux5-4r3
## to avoid a file name conflict on MSDOS.
machine=aviion opsys=dgux5-4-3
;;
m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* )
machine=aviion opsys=dgux5-4r2
;;
m88k-dg-dgux* )
machine=aviion opsys=dgux
;;
## Data General AViiON Intel (x86) Machines
## Exists from 5.4.3 (current i586-dg-dguxR4.11)
## Ehud Karni, 1998-may-30, ehud@unix.simonwiesel.co.il
i[345]86-dg-dguxR4* )
machine=aviion-intel opsys=dgux4
;;
## DECstations
mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0* | mips-dec-bsd4.2* )
machine=pmax opsys=bsd4-2
;;
@ -2547,96 +2420,6 @@ _ACEOF
machine=pmax opsys=mach-bsd4-3
;;
## Motorola Delta machines
m68k-motorola-sysv* | m68000-motorola-sysv* )
machine=delta opsys=usg5-3
if test -z "`type gnucc | grep 'not found'`"
then
if test -s /etc/167config
then CC="gnucc -m68040"
else CC="gnucc -m68881"
fi
else
if test -z "`type gcc | grep 'not found'`"
then CC=gcc
else CC=cc
fi
fi
;;
m88k-motorola-sysv4* )
# jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
# needs POSIX_SIGNALS and therefore needs usg5-4-2.
# I hope there are not other 4.0 versions for this machine
# which really need usg5-4 instead.
machine=delta88k opsys=usg5-4-2
;;
m88k-motorola-sysv* | m88k-motorola-m88kbcs* )
machine=delta88k opsys=usg5-3
;;
## Dual machines
m68*-dual-sysv* )
machine=dual opsys=usg5-2
;;
m68*-dual-uniplus* )
machine=dual opsys=unipl5-2
;;
## Elxsi 6400
elxsi-elxsi-sysv* )
machine=elxsi opsys=usg5-2
;;
## Encore machines
ns16k-encore-bsd* )
machine=ns16000 opsys=umax
;;
## The GEC 63 - apparently, this port isn't really finished yet.
# I'm sure we finished off the last of the machines, though. -- fx
## Gould Power Node and NP1
pn-gould-bsd4.2* )
machine=gould opsys=bsd4-2
;;
pn-gould-bsd4.3* )
machine=gould opsys=bsd4-3
;;
np1-gould-bsd* )
machine=gould-np1 opsys=bsd4-3
;;
## Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000
## as far as Emacs is concerned).
m88k-harris-cxux* )
# Build needs to be different on 7.0 and later releases
case "`uname -r`" in
[56].[0-9] ) machine=nh4000 opsys=cxux ;;
[7].[0-9] ) machine=nh4000 opsys=cxux7 ;;
esac
NON_GNU_CPP="/lib/cpp"
;;
## Harris ecx or gcx running CX/UX (Series 1200, Series 3000)
m68k-harris-cxux* )
machine=nh3000 opsys=cxux
;;
## Harris power pc NightHawk running Power UNIX (Series 6000)
powerpc-harris-powerunix )
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
;;
## HP 9000 series 200 or 300
m68*-hp-bsd* )
machine=hp9000s300 opsys=bsd4-3
@ -2698,21 +2481,7 @@ _ACEOF
machine=hp800 opsys=nextstep
;;
## Orion machines
orion-orion-bsd* )
machine=orion opsys=bsd4-2
;;
clipper-orion-bsd* )
machine=orion105 opsys=bsd4-2
;;
## IBM machines
i[3456]86-ibm-aix1.1* )
machine=ibmps2-aix opsys=usg5-2-2
;;
i[3456]86-ibm-aix1.[23]* | i[3456]86-ibm-aix* )
machine=ibmps2-aix opsys=usg5-3
;;
i370-ibm-aix*)
machine=ibm370aix opsys=usg5-3
;;
@ -2749,64 +2518,12 @@ _ACEOF
rs6000-ibm-aix* | powerpc-ibm-aix* )
machine=ibmrs6000 opsys=aix3-2
;;
romp-ibm-bsd4.3* )
machine=ibmrt opsys=bsd4-3
;;
romp-ibm-bsd4.2* )
machine=ibmrt opsys=bsd4-2
;;
romp-ibm-aos4.3* )
machine=ibmrt opsys=bsd4-3
;;
romp-ibm-aos4.2* )
machine=ibmrt opsys=bsd4-2
;;
romp-ibm-aos* )
machine=ibmrt opsys=bsd4-3
;;
romp-ibm-bsd* )
machine=ibmrt opsys=bsd4-3
;;
romp-ibm-aix* )
machine=ibmrt-aix opsys=usg5-2-2
;;
## Integrated Solutions `Optimum V'
m68*-isi-bsd4.2* )
machine=isi-ov opsys=bsd4-2
;;
m68*-isi-bsd4.3* )
machine=isi-ov opsys=bsd4-3
;;
## Intel 386 machines where we do care about the manufacturer
i[3456]86-intsys-sysv* )
machine=is386 opsys=usg5-2-2
;;
## Prime EXL
i[3456]86-prime-sysv* )
machine=i386 opsys=usg5-3
;;
## Sequent Symmetry running Dynix
i[3456]86-sequent-bsd* )
machine=symmetry opsys=bsd4-3
;;
## Sequent Symmetry running ptx 4, which is a modified SVR4.
i[3456]86-sequent-ptx4* | i[3456]86-sequent-sysv4* )
machine=sequent-ptx opsys=ptx4
NON_GNU_CPP=/lib/cpp
;;
## Sequent Symmetry running DYNIX/ptx
## Use the old cpp rather than the newer ANSI one.
i[3456]86-sequent-ptx* )
machine=sequent-ptx opsys=ptx
NON_GNU_CPP="/lib/cpp"
;;
## ncr machine running svr4.3.
i[3456]86-ncr-sysv4.3 )
machine=ncr386 opsys=usg5-4-3
@ -2818,33 +2535,11 @@ _ACEOF
machine=ncr386 opsys=usg5-4-2
;;
## Intel Paragon OSF/1
i860-intel-osf1* )
machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp
;;
## Intel 860
i860-*-sysv4* )
machine=i860 opsys=usg5-4
NON_GNU_CC="/bin/cc" # Ie, not the one in /usr/ucb/cc.
NON_GNU_CPP="/usr/ccs/lib/cpp" # cc -E tokenizes macro expansion.
;;
## Macintosh PowerPC
powerpc*-*-linux-gnu* )
machine=macppc opsys=gnu-linux
;;
## Masscomp machines
m68*-masscomp-rtu* )
machine=masscomp opsys=rtu
;;
## Megatest machines
m68*-megatest-bsd* )
machine=mega68 opsys=bsd4-2
;;
## Workstations sold by MIPS
## This is not necessarily all workstations using the MIPS processor -
## Irises are produced by SGI, and DECstations by DEC.
@ -2882,54 +2577,11 @@ _ACEOF
machine=m68k opsys=nextstep
;;
## The complete machine from National Semiconductor
ns32k-ns-genix* )
machine=ns32000 opsys=usg5-2
;;
## NCR machines
m68*-ncr-sysv2* | m68*-ncr-sysvr2* )
machine=tower32 opsys=usg5-2-2
;;
m68*-ncr-sysv3* | m68*-ncr-sysvr3* )
machine=tower32v3 opsys=usg5-3
;;
## NEC EWS4800
mips-nec-sysv4*)
machine=ews4800 opsys=ux4800
;;
## Nixdorf Targon 31
m68*-nixdorf-sysv* )
machine=targon31 opsys=usg5-2-2
;;
## Nu (TI or LMI)
m68*-nu-sysv* )
machine=nu opsys=usg5-2
;;
## Plexus
m68*-plexus-sysv* )
machine=plexus opsys=usg5-2
;;
## Pyramid machines
## I don't really have any idea what sort of processor the Pyramid has,
## so I'm assuming it is its own architecture.
pyramid-pyramid-bsd* )
machine=pyramid opsys=bsd4-2
;;
## Sequent Balance
ns32k-sequent-bsd4.2* )
machine=sequent opsys=bsd4-2
;;
ns32k-sequent-bsd4.3* )
machine=sequent opsys=bsd4-3
;;
## Siemens Nixdorf
mips-siemens-sysv* | mips-sni-sysv*)
machine=mips-siemens opsys=usg5-4
@ -2938,20 +2590,7 @@ _ACEOF
;;
## Silicon Graphics machines
## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
m68*-sgi-iris3.5* )
machine=irist opsys=iris3-5
;;
m68*-sgi-iris3.6* | m68*-sgi-iris*)
machine=irist opsys=iris3-6
;;
## Iris 4D
mips-sgi-irix3* )
machine=iris4d opsys=irix3-3
;;
mips-sgi-irix4* )
machine=iris4d opsys=irix4-0
;;
mips-sgi-irix6.5 )
machine=iris4d opsys=irix6-5
# Without defining _LANGUAGE_C, things get masked out in the headers
@ -2975,31 +2614,6 @@ _ACEOF
machine=iris4d opsys=irix5-2
;;
## SONY machines
m68*-sony-bsd4.2* )
machine=news opsys=bsd4-2
;;
m68*-sony-bsd4.3* )
machine=news opsys=bsd4-3
;;
m68*-sony-newsos3* | m68*-sony-news3*)
machine=news opsys=bsd4-3
;;
mips-sony-bsd* | mips-sony-newsos4* | mips-sony-news4*)
machine=news-risc opsys=bsd4-3
;;
mips-sony-newsos6* )
machine=news-r6 opsys=newsos6
;;
mips-sony-news* )
machine=news-risc opsys=newsos5
;;
## Stride
m68*-stride-sysv* )
machine=stride opsys=usg5-2
;;
## Suns
sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
machine=sparc opsys=gnu-linux
@ -3009,10 +2623,6 @@ _ACEOF
| i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
| rs6000-*-solaris2*)
case "${canonical}" in
m68*-sunos1* ) machine=sun1 ;;
m68*-sunos2* ) machine=sun2 ;;
m68* ) machine=sun3 ;;
i[3456]86-sun-sunos[34]* ) machine=sun386 ;;
i[3456]86-*-* ) machine=intel386 ;;
amd64-*-*|x86_64-*-*) machine=amdx86-64 ;;
powerpcle* ) machine=powerpcle ;;
@ -3021,26 +2631,6 @@ _ACEOF
* ) unported=yes ;;
esac
case "${canonical}" in
## The Sun386 didn't get past 4.0.
i[3456]86-*-sunos4 ) opsys=sunos4-0 ;;
*-sunos4.0* ) opsys=sunos4-0 ;;
*-sunos4.1.[3-9]*noshare )
## This name is sunos413 instead of sunos4-1-3
## to avoid a file name conflict on MSDOS.
opsys=sunos413
NON_GNU_CPP=/usr/lib/cpp
NON_GCC_TEST_OPTIONS=-Bstatic
GCC_TEST_OPTIONS=-static
;;
*-sunos4.1.[3-9]* | *-sunos4shr*)
opsys=sunos4shr
NON_GNU_CPP=/usr/lib/cpp
;;
*-sunos4* | *-sunos )
opsys=sunos4-1
NON_GCC_TEST_OPTIONS=-Bstatic
GCC_TEST_OPTIONS=-static
;;
*-sunos5.3* | *-solaris2.3* )
opsys=sol2-3
NON_GNU_CPP=/usr/ccs/lib/cpp
@ -3083,50 +2673,11 @@ _ACEOF
machine=sparc opsys=nextstep
;;
## Tadpole 68k
m68*-tadpole-sysv* )
machine=tad68k opsys=usg5-3
;;
## Tahoe machines
tahoe-tahoe-bsd4.2* )
machine=tahoe opsys=bsd4-2
;;
tahoe-tahoe-bsd4.3* )
machine=tahoe opsys=bsd4-3
;;
## Tandem Integrity S2
mips-tandem-sysv* )
machine=tandem-s2 opsys=usg5-3
;;
## Tektronix XD88
m88k-tektronix-sysv3* )
machine=tekxd88 opsys=usg5-3
;;
## Tektronix 16000 box (6130?)
ns16k-tektronix-bsd* )
machine=ns16000 opsys=bsd4-2
;;
## Tektronix 4300
## src/m/tek4300.h hints that this is a m68k machine.
m68*-tektronix-bsd* )
machine=tek4300 opsys=bsd4-3
;;
## Titan P2 or P3
## We seem to have lost the machine-description file titan.h!
titan-titan-sysv* )
machine=titan opsys=usg5-3
;;
## Ustation E30 (SS5E)
m68*-unisys-uniplus* )
machine=ustation opsystem=unipl5-2
;;
## Vaxen.
vax-dec-* )
machine=vax
@ -3141,18 +2692,6 @@ _ACEOF
esac
;;
## Whitechapel MG1
ns16k-whitechapel-* )
machine=mg1
## We don't know what sort of OS runs on these; we'll let the
## operating system guessing code below try.
;;
## Wicat
m68*-wicat-sysv* )
machine=wicat opsys=usg5-2
;;
## IA-64
ia64*-*-linux* )
machine=ia64 opsys=gnu-linux
@ -3166,25 +2705,8 @@ _ACEOF
*-darwin* ) opsys=darwin
CPP="${CC-cc} -E -no-cpp-precomp"
;;
*-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
*-isc2.2* ) opsys=isc2-2 ;;
*-isc4.0* ) opsys=isc4-0 ;;
*-isc4.* ) opsys=isc4-1
GCC_TEST_OPTIONS=-posix
NON_GCC_TEST_OPTIONS=-Xp
;;
*-isc* ) opsys=isc3-0 ;;
*-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
*-esix* ) opsys=esix ;;
*-xenix* ) opsys=xenix ;;
*-linux-gnu* ) opsys=gnu-linux ;;
*-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
*-sco3.2v5* ) opsys=sco5
NON_GNU_CPP=/lib/cpp
# Prevent -belf from being passed to $CPP.
# /lib/cpp does not accept it.
OVERRIDE_CPPFLAGS=" "
;;
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
@ -3211,11 +2733,6 @@ _ACEOF
RANLIB="ar -ts"
;;
## UXP/V
f301-fujitsu-uxpv4.1)
machine=f301 opsys=uxpv
;;
## AMD x86-64 Linux-based GNU system
x86_64-*-linux-gnu* )
machine=amdx86-64 opsys=gnu-linux
@ -5993,14 +5510,14 @@ fi
### The standard library on x86-64 GNU/Linux distributions can
### The standard library on x86-64 and s390x GNU/Linux distributions can
### be located in either /usr/lib64 or /usr/lib.
case "${canonical}" in
x86_64-*-linux-gnu* )
x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
if test -d /usr/lib64; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_X86_64_LIB64_DIR 1
#define HAVE_LIB64_DIR 1
_ACEOF
fi
@ -9767,22 +9284,6 @@ case ${HAVE_X11} in
yes ) HAVE_MENUS=yes ;;
esac
if test "${opsys}" = "hpux9"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9-x11r4.h"
;;
esac
fi
if test "${opsys}" = "hpux9shr"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9shxr4.h"
;;
esac
fi
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"

View File

@ -1,3 +1,9 @@
2008-01-17 Andreas Schwab <schwab@suse.de>
* m/amdx86-64.h (START_FILES, LIB_STANDARD): Use HAVE_LIB64_DIR
instead of HAVE_X86_64_LIB64_DIR.
* m/ibms390x.h (START_FILES, LIB_STANDARD): Likewise.
2008-01-17 Glenn Morris <rgm@gnu.org>
* m/ibms390x.h (START_FILES, LIB_STANDARD): Adjust value according

View File

@ -298,6 +298,9 @@ Boston, MA 02110-1301, USA. */
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#undef HAVE_LANGINFO_CODESET
/* Define to 1 if the directory /usr/lib64 exists. */
#undef HAVE_LIB64_DIR
/* Define to 1 if you have the `com_err' library (-lcom_err). */
#undef HAVE_LIBCOM_ERR
@ -711,9 +714,6 @@ Boston, MA 02110-1301, USA. */
/* Define to 1 if you have the X11R6 or newer version of Xt. */
#undef HAVE_X11XTR6
/* Define to 1 if the file /usr/lib64 exists. */
#undef HAVE_X86_64_LIB64_DIR
/* Define to 1 if you have the Xaw3d library (-lXaw3d). */
#undef HAVE_XAW3D