Merge branch 'jc/maint-svn-info-test-fix'

diff --git a/Makefile b/Makefile
index 5103dd4666a5bc2447c80421314aca8c5ffa7b13..8cf7da9838d62de82c18656007f882f02963de8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1303,11 +1303,15 @@ else
        BLK_SHA1 = 1
        OPENSSL_LIBSSL =
 endif
+ifdef NO_OPENSSL
+       LIB_4_CRYPTO =
+else
 ifdef NEEDS_SSL_WITH_CRYPTO
        LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
 else
        LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
 endif
+endif
 ifdef NEEDS_LIBICONV
        ifdef ICONVDIR
                BASIC_CFLAGS += -I$(ICONVDIR)/include