X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Configure;h=cbbf4de8b25f19ba9020740748d36a5c66abf911;hb=068fc255aca09e8e96116787e1ee7de866742729;hp=e658eb7cd97c2cc27e138105e8b4ff92ca752a07;hpb=ddc899bada0b816f8a20360b7bc63750bc0361f5;p=oweals%2Fopenssl.git

diff --git a/Configure b/Configure
index e658eb7cd9..cbbf4de8b2 100755
--- a/Configure
+++ b/Configure
@@ -904,11 +904,11 @@ PROCESS_ARGS:
 				}
 			elsif (/^--with-fipsdir=(.*)$/)
 				{
-				$fipsdir="$1/";
+				$fipsdir="$1";
 				}
 			elsif (/^--with-fipslibdir=(.*)$/)
 				{
-				$fipslibdir="$1/";
+				$fipslibdir="$1";
 				}
 			elsif (/^--with-baseaddr=(.*)$/)
 				{
@@ -1095,6 +1095,8 @@ foreach (sort (keys %disabled))
 			else
 				{
 				push @skip, $algo;
+				# fix-up crypto/directory name(s)
+				@skip[$#skip]="whrlpool" if $algo eq "whirlpool";
 				print " (skip dir)";
 
 				$depflags .= " -DOPENSSL_NO_$ALGO";
@@ -1391,14 +1393,6 @@ if (!$IsMK1MF)
 		}
 	}
 
-if (!defined($disabled{"sctp"}))
-	{
-	if ($target =~ /^solaris/)
-		{
-		$cflags = "$cflags -D_XPG4_2 -D__EXTENSIONS__";
-		}
-	}
-
 $cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
 
 #
@@ -1521,7 +1515,7 @@ else	{
 	$aes_obj=$aes_enc;
 	}
 $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
 	{
 	$cflags.=" -DWHIRLPOOL_ASM";
 	}