Commit 3647c171 authored by Jim Blandy's avatar Jim Blandy
Browse files

* configure: Recognize strings like "sysvr0" or "sysvr1" as System V.

	* configure: When processing the name of the configure script,
	collapse `././' to `./', but leave a single `./' prefix alone.

	* configure: Doc fix.

	* configure: Handle isc3.0 correctly.
parent 20099070
...@@ -29,21 +29,21 @@ ...@@ -29,21 +29,21 @@
### If configure succeeds, it leaves its status in config.status. ### If configure succeeds, it leaves its status in config.status.
### If configure fails after disturbing the status quo, ### If configure fails after disturbing the status quo,
### config.status is removed. ### config.status is removed.
###
### Remove any leading "." elements from the path name. If we don't ### Remove any more than one leading "." element from the path name.
### remove them, then another "./" will be prepended to the file name ### If we don't remove them, then another "./" will be prepended to
### each time we use config.status, and the program name will get larger ### the file name each time we use config.status, and the program name
### and larger. This wouldn't be a problem, except that since progname ### will get larger and larger. This wouldn't be a problem, except
### gets recorded in all the Makefiles this script produces, ### that since progname gets recorded in all the Makefiles this script
### move-if-change thinks they're different when they're not. ### produces, move-if-change thinks they're different when they're
### not.
### ###
### It would be nice if we could put the ./ in a \( \) group and then ### It would be nice if we could put the ./ in a \( \) group and then
### apply the * operator to that, so we remove as many leading ./././'s ### apply the * operator to that, so we remove as many leading ./././'s
### as are present, but some seds (like Ultrix's sed) don't allow you to ### as are present, but some seds (like Ultrix's sed) don't allow you to
### apply * to a \( \) group. Bleah. ### apply * to a \( \) group. Bleah.
progname="`echo $0 | sed 's:^\./::'`" progname="`echo $0 | sed 's:^\./\./:\./:'`"
#### Usage messages. #### Usage messages.
...@@ -260,6 +260,10 @@ if configuration=`${srcdir}/config.sub "${configuration}"` ; then : ; else ...@@ -260,6 +260,10 @@ if configuration=`${srcdir}/config.sub "${configuration}"` ; then : ; else
exit $? exit $?
fi fi
### If you add support for a new configuration, add code to this
### switch statement to recognize your configuration name and select
### the appropriate operating system and machine description files.
### You would hope that you could choose an m/*.h file pretty much ### You would hope that you could choose an m/*.h file pretty much
### based on the machine portion of the configuration name, and an s- ### based on the machine portion of the configuration name, and an s-
### file based on the operating system portion. However, it turns out ### file based on the operating system portion. However, it turns out
...@@ -268,12 +272,17 @@ fi ...@@ -268,12 +272,17 @@ fi
### all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS ### all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS
### machines. So we basically have to have a special case for each ### machines. So we basically have to have a special case for each
### configuration name. ### configuration name.
###
### As far as handling version numbers on operating systems is ### As far as handling version numbers on operating systems is
### concerned, make sure things will fail in a fixable way. If ### concerned, make sure things will fail in a fixable way. If
### /etc/MACHINES doesn't say anything about version numbers, be ### /etc/MACHINES doesn't say anything about version numbers, be
### prepared to handle anything reasonably. If version numbers ### prepared to handle anything reasonably. If version numbers
### matter, be sure /etc/MACHINES says something about it. ### matter, be sure /etc/MACHINES says something about it.
###
### Eric Raymond says we should accept strings like "sysvr4" to mean
### "System V Release 4"; he writes, "The old convention encouraged
### confusion between `system' and `release' levels'."
machine='' opsys='' unported='false' machine='' opsys='' unported='false'
case "${configuration}" in case "${configuration}" in
...@@ -526,10 +535,10 @@ case "${configuration}" in ...@@ -526,10 +535,10 @@ case "${configuration}" in
;; ;;
## NCR machines ## NCR machines
m68*-ncr-sysv2* ) m68*-ncr-sysv2* | m68*-ncr-sysvr2* )
machine=tower32 opsys=usg5-2-2 machine=tower32 opsys=usg5-2-2
;; ;;
m68*-ncr-sysv3* ) m68*-ncr-sysv3* | m68*-ncr-sysvr3* )
machine=tower32v3 opsys=usg5-3 machine=tower32v3 opsys=usg5-3
;; ;;
...@@ -648,13 +657,13 @@ case "${configuration}" in ...@@ -648,13 +657,13 @@ case "${configuration}" in
vax-dec-* ) vax-dec-* )
machine=vax machine=vax
case "${configuration}" in case "${configuration}" in
*-bsd4.1 ) opsys=bsd4-1 ;; *-bsd4.1 ) opsys=bsd4-1 ;;
*-bsd4.2 | *-ultrix[0-3].* | *-ultrix4.0 ) opsys=bsd4-2 ;; *-bsd4.2 | *-ultrix[0-3].* | *-ultrix4.0 ) opsys=bsd4-2 ;;
*-bsd4.3 | *-ultrix* ) opsys=bsd4-3 ;; *-bsd4.3 | *-ultrix* ) opsys=bsd4-3 ;;
*-sysv[01]* ) opsys=usg5-0 ;; *-sysv[01]* | *-sysvr[01]* ) opsys=usg5-0 ;;
*-sysv2* ) opsys=usg5-2 ;; *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;;
*-vms* ) opsys=vms ;; *-vms* ) opsys=vms ;;
* ) unported=true * ) unported=true
esac esac
;; ;;
...@@ -686,11 +695,11 @@ if [ ! "${opsys}" ]; then ...@@ -686,11 +695,11 @@ if [ ! "${opsys}" ]; then
*-bsd4.[01] ) opsys=bsd4-1 ;; *-bsd4.[01] ) opsys=bsd4-1 ;;
*-bsd4.2 ) opsys=bsd4-2 ;; *-bsd4.2 ) opsys=bsd4-2 ;;
*-bsd4.3 ) opsys=bsd4-3 ;; *-bsd4.3 ) opsys=bsd4-3 ;;
*-sysv0 ) opsys=usg5-0 ;; *-sysv0 | *-sysvr0 ) opsys=usg5-0 ;;
*-sysv2 ) opsys=usg5-2 ;; *-sysv2 | *-sysvr2 ) opsys=usg5-2 ;;
*-sysv2.2 ) opsys=usg5-2-2 ;; *-sysv2.2 | *-sysvr2.2 ) opsys=usg5-2-2 ;;
*-sysv3 ) opsys=usg5-3 ;; *-sysv3 | *-sysvr3 ) opsys=usg5-3 ;;
*-sysv4 ) opsys=usg5-4 ;; *-sysv4 | *-sysvr4 ) opsys=usg5-4 ;;
* ) * )
unported=true unported=true
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment