From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 15 Dec 2007 01:40:47 +0000 (+0000)
Subject: Make test utilities build in non-FIPS compiles.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b2e785e506739b43144beaf6bc5f2ba4c645831;p=oweals%2Fopenssl.git

Make test utilities build in non-FIPS compiles.
---

diff --git a/test/Makefile b/test/Makefile
index 6dd5bce9d9..6756c69f5a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -394,7 +394,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 	fi; \
 	if [ "$(FIPSCANLIB)" = "libfips" ]; then \
 		LIBRARIES="-L$(TOP) -lfips"; \
-	else \
+	elif [ -n "$(FIPSCANLIB)" ]; then \
 		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 		LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
 	fi; \
@@ -407,7 +407,7 @@ FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 		shlib_target="$(SHLIB_TARGET)"; \
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-	if [ -z "$(SHARED_LIBS)" ] ; then \
+	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
 		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
 	fi; \
 	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \