diff configure @ 10:49a24b4fd526 r19-15b6

Import from CVS: tag r19-15b6
author cvs
date Mon, 13 Aug 2007 08:47:52 +0200
parents 4b173ad71786
children 9ee227acff29
line wrap: on
line diff
--- a/configure	Mon Aug 13 08:47:36 2007 +0200
+++ b/configure	Mon Aug 13 08:47:52 2007 +0200
@@ -1807,20 +1807,20 @@
   hppa*-hp-hpux7* )
     machine=hp800 opsys=hpux NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
-  hppa*-hp-hpux8shr* )
-    machine=hp800 opsys=hpux8shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
+  hppa*-hp-hpux8*shr* )
+    machine=hp800 opsys=hpux8-shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
   hppa*-hp-hpux8* )
     machine=hp800 opsys=hpux8 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
-  hppa*-hp-hpux9shr* )
-    machine=hp800 opsys=hpux9shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
+  hppa*-hp-hpux9*shr* )
+    machine=hp800 opsys=hpux9-shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
   hppa*-hp-hpux9* )
     machine=hp800 opsys=hpux9 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
-  hppa*-hp-hpux10shr* )
-    machine=hp800 opsys=hpux10shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
+  hppa*-hp-hpux10*shr* )
+    machine=hp800 opsys=hpux10*shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
   ;;
   hppa*-hp-hpux10* )
     machine=hp800 opsys=hpux10 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
@@ -2152,11 +2152,11 @@
     case "${canonical}" in
       ## The Sun386 didn't get past 4.0.
       i[3-9]86-*-sunos4	   ) opsys=sunos4-0      ;;
-      *-sunos4shr*	   ) opsys=sunos4-0shr   ;;
-      *-sunos4-0shr*	   ) opsys=sunos4-0shr   ;;
-      *-sunos4-1shr*	   ) opsys=sunos4-1shr   ;;
-      *-sunos4-1-2shr*	   ) opsys=sunos4-1-2shr ;;
-      *-sunos4-1-[3-9]shr* ) opsys=sunos4-1-3shr ;;
+      *-sunos4*shr*	   ) opsys=sunos4-0-shr   ;;
+      *-sunos4-0*shr*	   ) opsys=sunos4-0-shr   ;;
+      *-sunos4-1*shr*	   ) opsys=sunos4-1-shr   ;;
+      *-sunos4-1-2*shr*	   ) opsys=sunos4-1-2-shr ;;
+      *-sunos4-1-[3-9]*shr* ) opsys=sunos4-1-3-shr ;;
       *-sunos4.0*	   ) opsys=sunos4-0      ;;
       *-sunos4.1.2*        ) opsys=sunos4-1-2    ;;
       *-sunos4.1.[3-9]*	   ) opsys=sunos4-1-3    ;;
@@ -2355,13 +2355,13 @@
 
 if [ "${dynamic}" = "yes" ]; then
   case "${opsys}" in
-    hpux8		) opsys=hpux8shr ;;
-    hpux9		) opsys=hpux9shr ;;
-    hpux10		) opsys=hpux10shr ;;
-    sunos4-0		) opsys=sunos4-0shr ;;
-    sunos4-1		) opsys=sunos4-1shr ;;
-    sunos4-1-2		) opsys=sunos4-1-2shr ;;
-    sunos4-1-3		) opsys=sunos4-1-3shr ;;
+    hpux8		) opsys=hpux8-shr ;;
+    hpux9		) opsys=hpux9-shr ;;
+    hpux10		) opsys=hpux10-shr ;;
+    sunos4-0		) opsys=sunos4-0-shr ;;
+    sunos4-1		) opsys=sunos4-1-shr ;;
+    sunos4-1-2		) opsys=sunos4-1-2-shr ;;
+    sunos4-1-3		) opsys=sunos4-1-3-shr ;;
     sco5		) opsys=sco5-shr ;;
   esac
 elif [ "${dynamic}" = "no" ]; then
@@ -3670,7 +3670,7 @@
   esac
 fi
 
-if test "${opsys}" = "hpux9shr"; then
+if test "${opsys}" = "hpux9-shr"; then
   case "${x_libraries}" in
     *X11R4* )
       opsysfile="s/hpux9shxr4.h"