generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow fips install dir to be specified for VC++ build.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-02-08 00:47:30 +00:00
parent bf059c2efc
commit 8d6e32a07c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Configure
View File

@ -869,6 +869,10 @@ PROCESS_ARGS:
{
$withargs{"zlib-lib"}=$1;
}
elsif (/^--with-fipslibdir=(.*)$/)
{
$withargs{"fipslibdir"}="$1";
}
elsif (/^--with-zlib-include=(.*)$/)
{
$withargs{"zlib-include"}="-I$1";
@ -1318,6 +1322,7 @@ while (<IN>)
s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
s/^FIPSLIBDIR=.*/FIPSLIBDIR=$withargs{"fipslibdir"}/;
s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;

5
util/mk1mf.pl
View File

@ -359,6 +359,9 @@ for (;;)
if ($key eq "LIBOBJ")
{ $libobj=&var_add($dir,$val); }
if ($key eq "FIPSLIBDIR")
{ $fipslibdir=$val;}
if (!($_=<IN>))
{ $_="RELATIVE_DIRECTORY=FINISHED\n"; }
}
@ -401,7 +404,7 @@ if ($fips)
$ex_build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
$ex_l_libs .= " \$(O_FIPSCANISTER)";
}
if ($fipslibpath eq "")
if ($fipslibdir eq "")
{
open (IN, "util/fipslib_path.txt") || fipslib_error();
$fipslibdir = <IN>;