From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 4 May 2006 16:32:31 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~1347
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3df90b2bb064a10bd4a944fb59fedf2cc29035c;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/Configure b/Configure
index 367e1683cc..a2dc83921e 100755
--- a/Configure
+++ b/Configure
@@ -928,7 +928,7 @@ foreach (sort (keys %disabled))
 
 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
 
-$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin");
+$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
 
 $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw");
 $exe_ext=".pm"  if ($target =~ /vos/);
@@ -1829,3 +1829,11 @@ sub test_sanity
 	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;
 	return $errorcnt;
 	}
+
+# Attempt to detect MSYS environment
+
+sub is_msys
+	{
+	return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys");
+	return 0;
+	}