Merge branch 'sb/submodule-update-reset-fix' into maint

diff --git a/Makefile b/Makefile
index bb5b7cdfb695ee7f15128d5885ea74a4e34f5b9b..1a9b23b6793f91072760affefac3851ca457a2f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ all::
 # it at all).
 #
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
-# This also implies BLK_SHA1.
 #
 # Define USE_LIBPCRE if you have and want to use libpcre. Various
 # commands such as log and grep offer runtime options to use
@@ -1275,7 +1274,6 @@ ifndef NO_OPENSSL
        endif
 else
        BASIC_CFLAGS += -DNO_OPENSSL
-       BLK_SHA1 = 1
        OPENSSL_LIBSSL =
 endif
 ifdef NO_OPENSSL