projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
166c9cb
)
use different default fips install directory
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 29 Jan 2011 23:05:15 +0000
(23:05 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 29 Jan 2011 23:05:15 +0000
(23:05 +0000)
Configure
patch
|
blob
|
history
diff --git
a/Configure
b/Configure
index f5dea0f2cf5fe1a75f225eef80a2265e6e82ea08..aca444a57dc2ee8cfc2f8121acba7be585188954 100755
(executable)
--- a/
Configure
+++ b/
Configure
@@
-1086,7
+1086,17
@@
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
$exe_ext=".nlm" if ($target =~ /netware/);
$exe_ext=".pm" if ($target =~ /vos/);
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
$exe_ext=".nlm" if ($target =~ /netware/);
$exe_ext=".pm" if ($target =~ /vos/);
-$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
+if ($openssldir eq "" and $prefix eq "")
+ {
+ if ($fips)
+ {
+ $openssldir="/usr/local/ssl/fips-2.0";
+ }
+ else
+ {
+ $openssldir="/usr/local/ssl";
+ }
+ }
$prefix=$openssldir if $prefix eq "";
$default_ranlib= &which("ranlib") or $default_ranlib="true";
$prefix=$openssldir if $prefix eq "";
$default_ranlib= &which("ranlib") or $default_ranlib="true";