From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 8 Feb 2006 00:47:30 +0000 (+0000)
Subject: Allow fips install dir to be specified for VC++ build.
X-Git-Tag: OpenSSL_0_9_7j~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d6e32a07c81d17f5b153c2326a05eb0c19fc870;p=oweals%2Fopenssl.git

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

diff --git a/Configure b/Configure
index 9feec9637c..fe333fe443 100755
--- a/Configure
+++ b/Configure
@@ -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/;
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 9f1af56796..d727b72001 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -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>;