(*-sun-sunos4*): Set GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS.

Don't insist on subversions for irix.

(hppa*-hp-hpux9shr): Move alternative up.

diff --git a/configure1.in b/configure1.in
index 3144bdd324170159f1ebf64ed0094ad22ed034c7..4eaa2aa6dfdaa168bda98f3bb112cadf9a4ece37 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -1,21 +1,18 @@
 dnl This is an autoconf script.
 dnl To rebuild the `configure' script from this, execute the command
 dnl    autoconf
-dnl in the directory containing this script.  You must have autoconf
-dnl version 1.9 or later.
-dnl
-dnl The following text appears in the resulting `configure' script,
-dnl explaining how to rebuild it.
+dnl in the directory containing this script.
 [#!/bin/sh
 #### Configuration script for GNU Emacs
 #### Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+#### This script requires autoconf version 1.9 or later.
 
 ### Don't edit this script!
 ### This script was automatically generated by the `autoconf' program
 ### from the file `./configure.in'.
 ### To rebuild it, execute the command
 ###    autoconf
-### in the this directory.  You must have autoconf version 1.7 or later.
+### in the this directory.
 
 ### This file is part of GNU Emacs.
 
@@ -687,12 +684,12 @@ case "${canonical}" in
   hppa*-hp-hpux8* )
     machine=hp800 opsys=hpux8
   ;;
-  hppa*-hp-hpux9* )
-    machine=hp800 opsys=hpux9
-  ;;
   hppa*-hp-hpux9shr* )
     machine=hp800 opsys=hpux9shr
   ;;
+  hppa*-hp-hpux9* )
+    machine=hp800 opsys=hpux9
+  ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
@@ -891,13 +888,13 @@ case "${canonical}" in
     machine=irist opsys=iris3-6
   ;;
   ## Iris 4D
-  mips-sgi-irix3.* )
+  mips-sgi-irix3* )
     machine=iris4d opsys=irix3-3
   ;;
-  mips-sgi-irix5.* )
+  mips-sgi-irix5* )
     machine=iris4d opsys=irix5-0
   ;;
-  mips-sgi-irix4.* | mips-sgi-irix* )
+  mips-sgi-irix4* | mips-sgi-irix* )
     machine=iris4d opsys=irix4-0
   ;;
 
@@ -942,7 +939,10 @@ case "${canonical}" in
                GCC_TEST_OPTIONS=-static
                ;;
       *-sunos4shr*       ) opsys=sunos4shr ;;
-      *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
+      *-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