integrate cfgperl changes into mainline

p4raw-id: //depot/perl@5892

3 files changed, 12 insertions, 8 deletions

diff --git a/Configure b/Configure
index f530921ac3..ddec97ca68 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Mar 21 23:20:29 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Wed Mar 22 19:13:31 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index df61932db8..8aee6d40dc 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -468,12 +468,11 @@ cat > UU/uselongdouble.cbu <<'EOCBU'
 case "$uselongdouble-$uselongdouble_done" in
 "$define-"|true-|[yY]*-)
 	case "$ccisworkshop" in
-	'')	cat <<EOM
+	'')	cat >&4 <<EOM
 
-I do not see the Sun Workshop compiler; therefore there is no
-libsunmath.so; therefore I cannot do long doubles, sorry.
+I do not see the Sun Workshop compiler; therefore I do not see
+the libsunmath; therefore I do not know how to do long doubles, sorry.
 I'm disabling the use of long doubles.
-
 EOM
 		uselongdouble="$undef"
 		;;
diff --git a/hints/unicosmk.sh b/hints/unicosmk.sh
index 1e6f0f06ac..f3416ffe34 100644
--- a/hints/unicosmk.sh
+++ b/hints/unicosmk.sh
@@ -20,8 +20,13 @@ esac
 # (an attempt to use them causes a runtime error)
 # XXX Configure probe for really functional shm*() is needed XXX
 if test "$d_shm" = ""; then
-    test "$d_shmctl" = "" && d_shmctl="$undef"
-    test "$d_shmget" = "" && d_shmget="$undef"
-    d_shm="$undef"
+    d_shmat=${d_shmat:-undef}
+    d_shmdt=${d_shmdt:-undef}
+    d_shmget=${d_shmget:-undef}
+    d_shmctl=${d_shmctl:-undef}
+    case "$d_shmat$d_shmctl$d_shmdt$d_shmget" in
+    *"undef"*) d_shm="$undef" ;;
+    esac
 fi
 
+