Commit f3df90b2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 11e46bd7

Configure

+9 −1
Original line number Diff line number Diff line
@@ -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;

	}