Mercurial > emacs
changeset 108810:bdbbcd45328f
* configure.in: Simplify some of the $canonical tests.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 27 May 2010 20:34:15 -0700 |
| parents | ff6d69344057 |
| children | b3e4bcfa7d8b |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 27 20:29:09 2010 -0700 +++ b/ChangeLog Thu May 27 20:34:15 2010 -0700 @@ -1,3 +1,7 @@ +2010-05-28 Glenn Morris <rgm@gnu.org> + + * configure.in: Simplify some of the $canonical tests. + 2010-05-27 Glenn Morris <rgm@gnu.org> * config.bat: Do not preprocess src/Makefile.in.
--- a/configure.in Thu May 27 20:29:09 2010 -0700 +++ b/configure.in Thu May 27 20:34:15 2010 -0700 @@ -369,7 +369,7 @@ ### the appropriate operating system and machine description files. ### 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/*.h ### file based on the operating system portion. However, it turns out ### that each m/*.h file is pretty manufacturer-specific - for ### example mips.h is MIPS @@ -381,10 +381,6 @@ ### /etc/MACHINES doesn't say anything about version numbers, be ### prepared to handle anything reasonably. If version numbers ### 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=no case "${canonical}" in @@ -499,16 +495,16 @@ s390x-*-linux-gnu* ) machine=ibms390x opsys=gnu-linux ;; - rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2* ) + rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix4.3* | powerpc-ibm-aix4.3* ) + powerpc-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix5* | powerpc-ibm-aix5* ) + rs6000-ibm-aix[56]* ) machine=ibmrs6000 opsys=aix4-2 ;; - rs6000-ibm-aix6* | powerpc-ibm-aix6* ) + powerpc-ibm-aix[56]* ) machine=ibmrs6000 opsys=aix4-2 ;;