From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 21 Dec 2001 19:47:03 +0000 (+0000)
Subject: Further VOS tweaks: the _exe needs to be introduced
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1fef16b31363aeccea5f6e69dffaeb2505ecf5be;p=p5sagit%2Fp5-mst-13.2.git

Further VOS tweaks: the _exe needs to be introduced
in the very beginning, and the make/gmake needs special
VOS logic.

p4raw-id: //depot/perl@13835
---

diff --git a/Configure b/Configure
index 8dd43a0..debcad2 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 Fri Dec 21 17:46:40 EET 2001 [metaconfig 3.0 PL70]
+# Generated on Fri Dec 21 20:17:57 EET 2001 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -165,6 +165,12 @@ esac
 test -d UU || mkdir UU
 cd UU && rm -f ./*
 
+if test -f "/system/gnu_library/bin/ar.pm"; then
+     _exe=".pm"
+else
+     _exe=""
+fi
+
 ccname=''
 ccversion=''
 ccsymbols=''
@@ -1044,7 +1050,6 @@ useposix=true
 : set useopcode=false in your hint file to disable the Opcode extension.
 useopcode=true
 : Trailing extension.  Override this in a hint file, if needed.
-_exe=''
 : Extra object files, if any, needed on this platform.
 archobjs=''
 archname=''
@@ -2075,6 +2080,7 @@ cpp
 csh
 date
 egrep
+gmake
 gzip
 less
 ln
@@ -2152,19 +2158,28 @@ for file in $trylist; do
 	esac
 done
 case "$egrep" in
-egrep$_exe)
+egrep)
 	echo "Substituting grep for egrep."
 	egrep=$grep
 	;;
 esac
 case "$ln" in
-ln$_exe)
+ln)
 	echo "Substituting cp for ln."
 	ln=$cp
 	;;
 esac
 case "$make$gmake" in
-*make$_exe)
+*/gmake|?:[\\/]gmake)
+	# We can't have osname yet.
+	if test -f "/system/gnu_library/bin/ar.pm"; then # Stratus VOS
+		# Assume that gmake, if found, is definitely GNU make
+		# and prefer it over the system make.
+		echo "Substituting gmake for make."
+		make=$gmake
+	fi
+	;;
+*/make|?:[\\/]make)
 	;;
 *)
 	echo "I can't find make or gmake, and my life depends on it." >&4
@@ -4141,7 +4156,7 @@ so="$ans"
 : or the new name.
 case "$_exe" in
 '')	case "$exe_ext" in
-    '')	;;
+	'')	;;
 	*)	_exe="$exe_ext" ;;
 	esac
 	;;
diff --git a/Makefile.SH b/Makefile.SH
index e6fb640..63f7417 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -198,6 +198,8 @@ shellflags = $shellflags
 # do it for you.
 $make_set_make
 
+# Mention $gmake here so it gets probed for by Configure.
+
 # These variables may need to be manually set for non-Unix systems.
 AR = $full_ar
 EXE_EXT = $_exe