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

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

parent bf059c2e

Configure

+5 −0
Original line number Diff line number Diff line
@@ -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/;

util/mk1mf.pl

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