* Makefile.in: increment VERSION. Change tar file name for dist and

bindist targets to be more standard.
	* config.guess: Update with the currently published file.
	* config.sub: ditto.
	* configure.in: Use value of build_alias instead of testing for
	directory names to set BUILDENV.
	* configure: ditto.
	* lib/Makefile.in: Change the name of the targets install,
	install-headers and install-libraries to xinstall, xinstall-headers
	and xinstall-libraries for system target specified installation.
	Recreate targets install, install-headers and install-libraries for
	exec-prefix specified installation.  Ditto for the uninstall targets of
	the same name.
This commit is contained in:
Earnie Boyd 2000-10-19 20:56:51 +00:00
parent 19d9e89b4a
commit 74266a0fee
5 changed files with 912 additions and 475 deletions

View File

@ -4,9 +4,10 @@
# This file is part of a free library for the Win32 API.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# but WITHOUT ANY WARANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# start config section
SHELL = @SHELL@
@ -26,100 +27,183 @@ datadir = @datadir@
infodir = @infodir@
includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
mkinstalldirs = mkdir -p
CC = @CC@
CC_FOR_TARGET = $(CC)
CFLAGS = @CFLAGS@
DLLTOOL = @DLLTOOL@
DLLTOOL_FLAGS = --as=$(AS) -k
AS = @AS@
AS_FOR_TARGET = $(AS_FOR_TARGET)
WINDRES = @WINDRES@
# Depending on if we build as part of winsup or mingw we need to
# add additional include paths in order to get the correct headers
# from the C library.
BUILDENV = @BUILDENV@
ifeq ($(BUILDENV), cygwin)
# winsup/include
# winsup/../newlib/libc/include
# winsup/../newlib/libc/sys/cygwin
EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
endif
ifeq ($(BUILDENV), mingw)
EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
endif
INCLUDES = -I$(srcdir)/../include $(EXTRA_INCLUDES)
CFLAGS = @CFLAGS@
ALL_CFLAGS = $(CFLAGS) $(INCLUDES)
RANLIB = @RANLIB@
AR = @AR@
LD = @LD@
TAR = tar
FLAGS_TO_PASS = \
AS="$(AS)" \
CC="$(CC)" \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
AR="$(AR)" \
RANLIB="$(RANLIB)" \
LD="$(LD)" \
DLLTOOL="$(DLLTOOL)" \
WINDRES="$(WINDRES)"
# end config section
SUBDIRS = lib
# headers
PACKAGE = w32api
VERSION = 0.3
HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h))
DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
install-sh README ChangeLog TODO
# libraries
all: lib
DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
LIBS = $(IMPLIBS) $(EXTRA_LIBS)
EXTRA_OBJS=uuid.o shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o $(UUID_OBJS) dinput.o
SOURCES = scrnsave.c shell32.c uuid.c largeint.c dinput.c dxguid.c \
res.rc test.c
%-subdirs:
for i in $(SUBDIRS); do \
$(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \
done
DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
lib:
$(MAKE) $(FLAGS_TO_PASS) -C $@
# targets
all: $(LIBS) $(EXTRA_OBJS)
TEST_OPTIONS = $(ALL_CFLAGS) -Wall -c $(srcdir)/test.c -o test.o
.PHONY: test
test:
$(MAKE) -C lib test $(FLAGS_TO_PASS)
@echo "Testing w32api..."
@for lang in c c++ objective-c ; do \
echo "$$lang..."; \
$(CC) -x$$lang $(TEST_OPTIONS) ; \
echo "$$lang UNICODE..."; \
$(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
done
@echo "windres..."
@$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
@echo "windres UNICODE..."
@$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
@rm -f test.o
install uninstall:
for i in $(SUBDIRS); do \
(cd $$i; $(MAKE) $@); \
scrnsavw.o: scrnsave.c
$(CC) -c $(ALL_CFLAGS) -DUNICODE -o $@ $<
# make rules
.SUFFIXES: .c .o .def .a
.c.o:
$(CC) -c $(ALL_CFLAGS) -o $@ $<
lib%.a : %.def %.o
$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def
$(AR) r $@ $*.o
$(RANLIB) $@
lib%.a: %.def
$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $<
lib%.a: %.o
$(AR) rc $@ $*.o
$(RANLIB) $@
# install headers and libraries in a target specified directory.
xinstall: xinstall-libraries xinstall-headers
xinstall-libraries: all
$(mkinstalldirs) $(tooldir)/lib
for i in $(LIBS); do \
$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \
done
distdir = $(PACKAGE)-$(VERSION)
xinstall-headers:
$(mkinstalldirs) $(tooldir)/include
for i in $(HEADERS); do \
$(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/$$i ; \
done
# uninstall headers and libraries from a target specified directory
xuninstall: xuninstall-libraries xuninstall-headers
xuninstall-libraries:
@for i in $(LIBS); do \
rm -f $(tooldir)/lib/$$i ; \
done
xuninstall-headers:
@for i in $(HEADERS); do \
rm -f $(tooldir)/include/$$i ; \
done
# install headers and libraries
install: install-libraries install-headers
install-libraries: all
$(mkinstalldirs) $(exec_prefix)/lib
for i in $(LIBS); do \
$(INSTALL_DATA) $$i $(exec_prefix)/lib/$$i ; \
done
install-headers:
$(mkinstalldirs) $(exec_prefix)/include
for i in $(HEADERS); do \
$(INSTALL_DATA) $(srcdir)/../include/$$i $(exec_prefix)/include/$$i ; \
done
# uninstall headers and libraries
uninstall: uninstall-libraries uninstall-headers
uninstall-libraries:
@for i in $(LIBS); do \
rm -f $(exec_prefix)/lib/$$i ; \
done
uninstall-headers:
@for i in $(HEADERS); do \
rm -f $(exec_prefix)/include/$$i ; \
done
dist:
rm -rf $(distdir)
mkdir $(distdir)
chmod 755 $(distdir)
for i in $(DIST_FILES); do \
cp -p $(srcdir)/$$i $(distdir)/$$i ; \
mkdir $(distdir)/include
chmod 755 $(distdir)/include
@for i in $(HEADERS); do \
cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \
done
for i in $(SUBDIRS); do \
(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
mkdir $(distdir)/lib
chmod 755 $(distdir)/lib
@for i in $(DISTFILES); do \
cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
done
rm -f $(distdir)-src.tar.gz
$(TAR) czf $(distdir)-src.tar.gz $(distdir)
bindist:
rm -rf $(distdir)
mkdir $(distdir)
chmod 755 $(distdir)
$(MAKE) install prefix=../$(distdir)
rm -f $(distdir).tar.gz
cd $(distdir); $(TAR) czf ../$(distdir).tar.gz .
Makefile: Makefile.in ../config.status ../configure
cd ..; $(SHELL) config.status
Makefile: Makefile.in config.status configure
$(SHELL) config.status
# clean
mostlyclean-top:
rm -f *~
clean-top:
rm -rf $(distdir)
maintainer-clean-top:
mostlyclean:
rm -f *~ *.o *.s
mostlyclean: mostlyclean-top mostlyclean-subdirs
clean: mostlyclean-top clean-subdirs
distclean: clean-top
rm -f Makefile config.status config.log config.cache TAGS *~
rm -f include/*~
rm -f $(distdir)*.tar.gz
$(MAKE) -C lib distclean
maintainer-clean: maintainer-clean-subdirs
clean:
rm -f *.o *.a *.s *~
.PHONY: lib test
distclean: clean
rm -f config.cache config.status config.log Makefile
maintainer-clean: distclean

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc.
version='2000-10-09'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
@ -25,6 +29,8 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
@ -45,42 +51,61 @@
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
if [ x$1 = x ]
then
echo Configuration name missing. 1>&2
echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
echo "or $0 ALIAS" 1>&2
echo where ALIAS is a recognized configuration type. 1>&2
exit 1
fi
me=`echo "$0" | sed -e 's,.*/,,'`
# First pass through any local machine types.
case $1 in
*local*)
echo $1
exit 0
;;
*)
;;
esac
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
# CYGNUS LOCAL marketing-names
# Here we handle any "marketing" names - translating them to
# standard triplets
case $1 in
mips-tx39-elf)
set mipstx39-unknown-elf
;;
*)
;;
Canonicalize a configuration name.
Operation modes:
-h, --help print this help, then exit
-V, --version print version number, then exit"
help="
Try \`$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
case "$1" in
--version | --vers* | -V )
echo "$version" ; exit 0 ;;
--help | --h* | -h )
echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
break ;;
-* )
exec >&2
echo "$me: invalid option $1"
echo "$help"
exit 1 ;;
*local*)
# First pass through any local machine types.
echo $1
exit 0;;
* )
break ;;
esac
done
case $# in
0) echo "$me: missing argument$help" >&2
exit 1;;
1) ;;
*) echo "$me: too many arguments$help" >&2
exit 1;;
esac
# END CYGNUS LOCAL marketing-names
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
linux-gnu*)
nto-qnx* | linux-gnu*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@ -106,18 +131,18 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple)
-apple | -axis)
os=
basic_machine=$1
;;
-sim | -cisco | -oki | -wec | -winbond ) # EGCS LOCAL
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
;;
-scout) # EGCS LOCAL
-scout)
;;
-wrs) # EGCS LOCAL
os=vxworks
-wrs)
os=-vxworks
basic_machine=$1
;;
-hiux*)
@ -168,70 +193,46 @@ case $os in
-psos*)
os=-psos
;;
-mint | -mint[0-9]*)
basic_machine=m68k-atari
os=-mint
;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 \
| tron | a29k | 580 | i960 | h8300 \
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
| alpha | alphaev[45678] | alphaev56 | alphapca5[67] \
| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 \
| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
| mipstx39 | mipstx39el \
| sparc | sparclet | sparclite | sparc64 | sparc86x | v850 \
| c4x)
| hppa64 \
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
| alphaev6[78] \
| we32k | ns16k | clipper | i370 | sh | sh[34] \
| powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
| mips64vr5000 | miprs64vr5000el | mcore \
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
| thumb | d10v | d30v | fr30 | avr)
basic_machine=$basic_machine-unknown
;;
m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
| h8500 | w65 | fr30) # CYGNUS / EGCS LOCAL
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
;;
strongarm) # CYGNUS LOCAL nickc/strongarm
basic_machine=$basic_machine-unknown
;;
thumb)
basic_machine=$basic_machine-unknown
;;
mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
basic_machine=$basic_machine-unknown
;;
mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
basic_machine=$basic_machine-unknown
;;
mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
basic_machine=$basic_machine-unknown
;;
mips16)
basic_machine=$basic_machine-unknown
;;
tic30) # CYGNUS LOCAL ian/tic30
basic_machine=$basic_machine-unknown
;;
c30) # CYGNUS LOCAL ian/tic30
basic_machine=tic30-unknown
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
;;
v850e) # CYGNUS LOCAL jtc/v850
basic_machine=$basic_machine-unknown
;;
v850ea) # CYGNUS LOCAL jtc/v850
basic_machine=$basic_machine-unknown
;;
d10v)
basic_machine=$basic_machine-unknown
;;
d30v) # CYGNUS LOCAL hunt/d30v
basic_machine=$basic_machine-unknown
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i[34567]86)
i[234567]86 | x86_64)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
@ -240,51 +241,32 @@ case $basic_machine in
exit 1
;;
# Recognize the basic CPU types with company name.
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
# FIXME: clean up the formatting here.
vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
| hppa-* | hppa1.0-* | hppa1.1-* \
| hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
| alpha-* | alphaev[45678]-* | alphaev56-* | alphapca5[67]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
| xps100-* | clipper-* | orion-* \
| x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
| hppa2.0n-* | hppa64-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
| alphaev6[78]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
| sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mipstx39-* | mipstx39el-* \
| f301-* | arm*-* \
| fr30-*) # CYGNUS LOCAL
;;
m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
;;
strongarm-*) # CYGNUS LOCAL nickc/strongarm
;;
thumb-*) # EGCS LOCAL angela/thumb
;;
v850-*) # EGCS LOCAL
;;
v850e-*) # CYGNUS LOCAL
;;
v850ea-*) # CYGNUS LOCAL
;;
d30v-*) # EGCS LOCAL
;;
mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
;;
mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
;;
mips16-*) # EGCS LOCAL krk/mips16
;;
tic30-*) # EGCS LOCAL ian/tic30
;;
c30-*) # EGCS LOCAL ian/tic30
basic_machine=tic30-unknown
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* | mcore-* \
| f301-* | armv*-* | s390-* | sv1-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
| thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
| bs2000-* | tic54x-* | c54x-* | x86_64-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd) # EGCS LOCAL
386bsd)
basic_machine=i386-unknown
os=-bsd
;;
@ -294,11 +276,11 @@ case $basic_machine in
3b*)
basic_machine=we32k-att
;;
a29khif) # EGCS LOCAL
a29khif)
basic_machine=a29k-amd
os=-udi
;;
adobe68k) # EGCS LOCAL
adobe68k)
basic_machine=m68010-adobe
os=-scout
;;
@ -317,21 +299,21 @@ case $basic_machine in
os=-sysv
;;
amiga | amiga-*)
basic_machine=m68k-cbm
basic_machine=m68k-unknown
;;
amigaos | amigados)
basic_machine=m68k-cbm
basic_machine=m68k-unknown
os=-amigaos
;;
amigaunix | amix)
basic_machine=m68k-cbm
basic_machine=m68k-unknown
os=-sysv4
;;
apollo68)
basic_machine=m68k-apollo
os=-sysv
;;
apollo68bsd) # EGCS LOCAL
apollo68bsd)
basic_machine=m68k-apollo
os=-bsd
;;
@ -378,6 +360,9 @@ case $basic_machine in
crds | unos)
basic_machine=m68k-crds
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@ -411,7 +396,7 @@ case $basic_machine in
encore | umax | mmax)
basic_machine=ns32k-encore
;;
es1800 | OSE68k | ose68k | ose | OSE) # EGCS LOCAL
es1800 | OSE68k | ose68k | ose | OSE)
basic_machine=m68k-ericsson
os=-ose
;;
@ -433,11 +418,11 @@ case $basic_machine in
basic_machine=h8300-hitachi
os=-hms
;;
h8300xray) # EGCS LOCAL
h8300xray)
basic_machine=h8300-hitachi
os=-xray
;;
h8500hms) # EGCS LOCAL
h8500hms)
basic_machine=h8500-hitachi
os=-hms
;;
@ -456,22 +441,6 @@ case $basic_machine in
basic_machine=m68k-hp
os=-hpux
;;
w89k-*) # EGCS LOCAL
basic_machine=hppa1.1-winbond
os=-proelf
;;
op50n-*) # EGCS LOCAL
basic_machine=hppa1.1-oki
os=-proelf
;;
op60c-*) # EGCS LOCAL
basic_machine=hppa1.1-oki
os=-proelf
;;
hppro) # EGCS LOCAL
basic_machine=hppa1.1-hp
os=-proelf
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
;;
@ -481,22 +450,21 @@ case $basic_machine in
hp9k3[2-9][0-9])
basic_machine=m68k-hp
;;
hp9k6[0-9][0-9] | hp6[0-9][0-9] )
hp9k6[0-9][0-9] | hp6[0-9][0-9])
basic_machine=hppa1.0-hp
;;
hp9k7[0-79][0-9] | hp7[0-79][0-9] )
hp9k7[0-79][0-9] | hp7[0-79][0-9])
basic_machine=hppa1.1-hp
;;
hp9k78[0-9] | hp78[0-9] )
hp9k78[0-9] | hp78[0-9])
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][13679] | hp8[0-9][13679] )
hp9k8[0-9][13679] | hp8[0-9][13679])
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
@ -505,13 +473,16 @@ case $basic_machine in
hppa-next)
os=-nextstep3
;;
hppaosf) # EGCS LOCAL
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
;;
hppro)
basic_machine=hppa1.1-hp
os=-proelf
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[34567]86v32)
@ -530,15 +501,15 @@ case $basic_machine in
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach) # EGCS LOCAL
i386mach)
basic_machine=i386-mach
os=-mach
;;
i386-vsta | vsta) # EGCS LOCAL
i386-vsta | vsta)
basic_machine=i386-unknown
os=-vsta
;;
i386-go32 | go32) # EGCS LOCAL
i386-go32 | go32)
basic_machine=i386-unknown
os=-go32
;;
@ -546,6 +517,10 @@ case $basic_machine in
basic_machine=i386-unknown
os=-mingw32
;;
i[34567]86-pw32 | pw32)
basic_machine=i586-unknown
os=-pw32
;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@ -574,6 +549,10 @@ case $basic_machine in
miniframe)
basic_machine=m68000-convergent
;;
*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
basic_machine=m68k-atari
os=-mint
;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
@ -588,24 +567,32 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
monitor) # EGCS LOCAL
mmix*)
basic_machine=mmix-knuth
os=-mmixware
;;
monitor)
basic_machine=m68k-rom68k
os=-coff
;;
msdos) # EGCS LOCAL
basic_machine=i386-unknown
msdos)
basic_machine=i386-unknown
os=-msdos
;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
;;
netbsd386)
basic_machine=i386-unknown # EGCS LOCAL
basic_machine=i386-unknown
os=-netbsd
;;
netwinder)
basic_machine=armv4l-corel
basic_machine=armv4l-rebel
os=-linux
;;
news | news700 | news800 | news900)
@ -620,7 +607,7 @@ case $basic_machine in
basic_machine=mips-sony
os=-newsos
;;
necv70) # EGCS LOCAL
necv70)
basic_machine=v70-nec
os=-sysv
;;
@ -649,18 +636,25 @@ case $basic_machine in
basic_machine=i960-intel
os=-nindy
;;
mon960) # EGCS LOCAL
mon960)
basic_machine=i960-intel
os=-mon960
;;
np1)
basic_machine=np1-gould
;;
OSE68000 | ose68000) # EGCS LOCAL
nsr-tandem)
basic_machine=nsr-tandem
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
;;
os68k) # EGCS LOCAL
os68k)
basic_machine=m68k-none
os=-os68k
;;
@ -681,19 +675,19 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pentium | p5 | k5 | nexen)
pentium | p5 | k5 | k6 | nexen)
basic_machine=i586-pc
;;
pentiumpro | p6 | k6 | 6x86)
pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc
;;
pentiumii | pentium2)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | nexen-*)
pentium-* | p5-* | k5-* | k6-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | k6-* | 6x86-*)
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
@ -717,7 +711,7 @@ case $basic_machine in
ps2)
basic_machine=i386-ibm
;;
rom68k) # EGCS LOCAL
rom68k)
basic_machine=m68k-rom68k
os=-coff
;;
@ -727,7 +721,7 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
sa29200) # EGCS LOCAL
sa29200)
basic_machine=a29k-amd
os=-udi
;;
@ -738,7 +732,7 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sparclite-wrs) # EGCS LOCAL
sparclite-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@ -749,10 +743,10 @@ case $basic_machine in
spur)
basic_machine=spur-unknown
;;
st2000) # EGCS LOCAL
st2000)
basic_machine=m68k-tandem
;;
stratus) # EGCS LOCAL
stratus)
basic_machine=i860-stratus
os=-sysv4
;;
@ -796,10 +790,22 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
sv1)
basic_machine=sv1-cray
os=-unicos
;;
symmetry)
basic_machine=i386-sequent
os=-dynix
;;
t3e)
basic_machine=t3e-cray
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
tx39)
basic_machine=mipstx39-unknown
;;
@ -817,7 +823,7 @@ case $basic_machine in
basic_machine=a29k-nyu
os=-sym1
;;
v810 | necv810) # EGCS LOCAL
v810 | necv810)
basic_machine=v810-nec
os=-none
;;
@ -844,9 +850,13 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
w65*) # EGCS LOCAL
basic_machine=w65-wdc
os=-none
w65*)
basic_machine=w65-wdc
os=-none
;;
w89k-*)
basic_machine=hppa1.1-winbond
os=-proelf
;;
xmp)
basic_machine=xmp-cray
@ -855,7 +865,7 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
z8k-*-coff) # EGCS LOCAL
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
;;
@ -866,13 +876,13 @@ case $basic_machine in
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
w89k) # EGCS LOCAL
w89k)
basic_machine=hppa1.1-winbond
;;
op50n) # EGCS LOCAL
op50n)
basic_machine=hppa1.1-oki
;;
op60c) # EGCS LOCAL
op60c)
basic_machine=hppa1.1-oki
;;
mips)
@ -897,6 +907,9 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sh3 | sh4)
basic_machine=sh-unknown
;;
sparc | sparcv9)
basic_machine=sparc-sun
;;
@ -909,16 +922,16 @@ case $basic_machine in
orion105)
basic_machine=clipper-highlevel
;;
mac | mpw | mac-mpw) # EGCS LOCAL
mac | mpw | mac-mpw)
basic_machine=m68k-apple
;;
pmac | pmac-mpw) # EGCS LOCAL
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@ -977,18 +990,29 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* )
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
# EGCS LOCAL
-qnx*)
case $basic_machine in
x86-* | i[34567]86-*)
;;
*)
os=-nto$os
;;
esac
;;
-nto*)
os=-nto-qnx
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mon960* | -lnews* )
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
# END EGCS LOCAL
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@ -998,6 +1022,12 @@ case $os in
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
;;
-wince*)
os=-wince
;;
-osfrose*)
os=-osfrose
;;
@ -1013,7 +1043,7 @@ case $os in
-acis*)
os=-aos
;;
-386bsd) # EGCS LOCAL
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
@ -1022,6 +1052,9 @@ case $os in
-ns2 )
os=-nextstep2
;;
-nsk*)
os=-nsk
;;
# Preserve the version number of sinix5.
-sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
@ -1047,15 +1080,18 @@ case $os in
# This must come after -sysvr4.
-sysv*)
;;
-ose*) # EGCS LOCAL
-ose*)
os=-ose
;;
-es1800*) # EGCS LOCAL
-es1800*)
os=-ose
;;
-xenix)
os=-xenix
;;
-*mint | -*MiNT)
os=-mint
;;
-none)
;;
*)
@ -1081,7 +1117,7 @@ case $basic_machine in
*-acorn)
os=-riscix1.2
;;
arm*-corel)
arm*-rebel)
os=-linux
;;
arm*-semi)
@ -1105,15 +1141,15 @@ case $basic_machine in
# default.
# os=-sunos4
;;
m68*-cisco) # EGCS LOCAL
m68*-cisco)
os=-aout
;;
mips*-cisco) # EGCS LOCAL
mips*-cisco)
os=-elf
;;
mips*-*)
os=-elf
;;
mips*-*) # EGCS LOCAL
os=-elf
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@ -1126,13 +1162,13 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-wec) # EGCS LOCAL
*-wec)
os=-proelf
;;
*-winbond) # EGCS LOCAL
*-winbond)
os=-proelf
;;
*-oki) # EGCS LOCAL
*-oki)
os=-proelf
;;
*-hp)
@ -1198,15 +1234,18 @@ case $basic_machine in
f301-fujitsu)
os=-uxpv
;;
*-rom68k) # EGCS LOCAL
*-rom68k)
os=-coff
;;
*-*bug) # EGCS LOCAL
*-*bug)
os=-coff
;;
*-apple) # EGCS LOCAL
*-apple)
os=-macos
;;
*-atari*)
os=-mint
;;
*)
os=-none
;;
@ -1252,7 +1291,7 @@ case $basic_machine in
-genix*)
vendor=ns
;;
-mvs*)
-mvs* | -opened*)
vendor=ibm
;;
-ptx*)
@ -1264,15 +1303,26 @@ case $basic_machine in
-aux*)
vendor=apple
;;
-hms*) # EGCS LOCAL
-hms*)
vendor=hitachi
;;
-mpw* | -macos*) # EGCS LOCAL
-mpw* | -macos*)
vendor=apple
;;
-*mint | -*MiNT)
vendor=atari
;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
echo $basic_machine$os
exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "version='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:

View File

@ -1183,12 +1183,10 @@ fi
echo $ac_n "checking for build environment""... $ac_c" 1>&6
echo "configure:1186: checking for build environment" >&5
BUILDENV=
if test -d ../../winsup; then
BUILDENV=cygwin
elif test -d ../mingw; then
BUILDENV=mingw
fi
case "$build_alias" in
*-mingw*) BUILDENV=mingw;;
*-cygwin*) BUILDENV=cygwin;;
esac
if test -z "$BUILDENV"; then
echo "$ac_t""standard" 1>&6
else

View File

@ -35,12 +35,10 @@ AC_CHECK_TOOL(WINDRES, windres, windres)
AC_SUBST(WINDRES)
AC_MSG_CHECKING([for build environment])
BUILDENV=
if test -d ../../winsup; then
BUILDENV=cygwin
elif test -d ../mingw; then
BUILDENV=mingw
fi
case "$build_alias" in
*-mingw*) BUILDENV=mingw;;
*-cygwin*) BUILDENV=cygwin;;
esac
if test -z "$BUILDENV"; then
AC_MSG_RESULT(standard)
else