Make test utilities build in non-FIPS compiles.

diff --git a/test/Makefile b/test/Makefile
index 6dd5bce9d965d493341eee1248b663814de61dd7..6756c69f5a0a5cbb54e7ec9a2665d3a649a50f04 100644 (file)
--- 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"; \