Merge branch 'jc/maint-no-openssl-build-fix' into maint

* jc/maint-no-openssl-build-fix:
Do not link with -lcrypto under NO_OPENSSL

diff --combined Makefile
index f2de401e29a812fbff7fbd85bbbfa6336ddbd6b3,5493086e5707e7a3f558e13909b34ac1f5ef4166..ecb4e64435b674d97d643bf04d896b26a2b505b2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1262,11 -1262,15 +1262,15 @@@ els
        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
@@@ -1879,7 -1883,7 +1883,7 @@@ builtin/tar-tree.o archive-tar.o: tar.
  builtin/pack-objects.o: thread-utils.h
  connect.o transport.o http-backend.o: url.h
  http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
 -http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h
 +http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
  
  xdiff-interface.o $(XDIFF_OBJS): \
        xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \