summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-05-04 16:24:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-05-04 16:24:27 +0000
commit5ab3e743f3447c7bbeee089985bb6aab593ab479 (patch)
treeffa4afbfbd4c65b38b07e15ffd12da514c0f7e31 /Configure
parent1c5dc844e7dedd1e7c32f5f5742f3f7befa74688 (diff)
downloadopenssl-new-5ab3e743f3447c7bbeee089985bb6aab593ab479.tar.gz
Detect MSYS and use Unix like build if detected.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure10
1 files changed, 9 insertions, 1 deletions
diff --git a/Configure b/Configure
index 9831ff3fab..afcc056f29 100755
--- a/Configure
+++ b/Configure
@@ -918,7 +918,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/);
@@ -1806,3 +1806,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;
+ }