From: Ulf Möller <ulf@openssl.org>
Date: Fri, 9 Apr 1999 16:25:25 +0000 (+0000)
Subject: Use Perl 5 even if Perl 4 comes first in the search path.
X-Git-Tag: OpenSSL_0_9_3beta1~359
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5a47e4afbdc1cc1ec8c98f63cbc49705b8a6f4f;p=oweals%2Fopenssl.git

Use Perl 5 even if Perl 4 comes first in the search path.
---

diff --git a/Configure b/Configure
index 5e78dd11a7..c5867401e3 100755
--- a/Configure
+++ b/Configure
@@ -731,7 +731,8 @@ sub which
 		{
 		if (-x "$path/$name")
 			{
-			return "$path/$name";
+			return "$path/$name" unless ($name eq "perl" and
+			 system("$path/$name -e " . '\'exit($]<5.0);\''));
 			}
 		}
 	}
diff --git a/config b/config
index 2427c4a1aa..2bc53c2424 100755
--- a/config
+++ b/config
@@ -344,13 +344,15 @@ fi
 if [ ".$PERL" = . ] ; then
 	for i in . `echo $PATH | sed 's/:/ /g'`; do
 		if [ -f "$i/perl" ] ; then
-			PERL="$i/perl"
-			break;
+			if "$i/perl" -e 'exit($]<5.0)'; then
+				PERL="$i/perl"
+				break;
+			fi;
 		fi;
 	done
 fi
 
-if $PERL -e 'exit($]>=5.0);' ; then
+if [ ".$PERL" = . ] ; then
 	echo "You need Perl 5."
 	exit 1
 fi