* configure.in (machine): Fix the versions in hpux version number test.

	Do not guess based on cpu type.  Do check for explicit system version.

1 files changed, 11 insertions, 6 deletions

diff --git a/configure1.in b/configure1.in
index e0999e5523e..1d494e24dc6 100755
--- a/configure1.in
+++ b/configure1.in
@@ -558,17 +558,22 @@ case "${configuration}" in
   ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
-  hppa1.0-hp-hpux* )
-    machine=hp9000s800 opsys=hpux
+  hppa*-hp-hpux7* )
+    machine=hp9000s800 opsys=hpux ;;
   ;;
-  hppa1.1-hp-hpux* )
-    machine=hp9000s800 opsys=hpux8
+  hppa*-hp-hpux8* )
+    machine=hp9000s800 opsys=hpux8 ;;
   ;;
+  hppa*-hp-hpux9* )
+    machine=hp9000s800 opsys=hpux9 ;;
+  ;;
+
+  ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
     ## Cross-compilation?  Nah!
     case "`uname -r`" in
-      *.08.* ) machine=hp9000s800 opsys=hpux ;;
-      *.09.* ) machine=hp9000s800 opsys=hpux8 ;;
+      *.08.* ) machine=hp9000s800 opsys=hpux8 ;;
+      *.09.* ) machine=hp9000s800 opsys=hpux9 ;;
       *) machine=hp9000s800 opsys=hpux ;;
     esac
   ;;