Test Windows without zlib

Author: jeroen

src/Makevars.win

@@ -1,15 +1,12 @@
 PKG_CONFIG ?= $(BINPREF)pkg-config
 OPENSSL_LIBS := $(shell $(PKG_CONFIG) --libs openssl)
 
-ifneq ($(OPENSSL_LIBS),)
-$(info using OpenSSL from Rtools)
-OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl)
-else
+
 RWINLIB = ../windows/libssl
 TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
 OPENSSL_CFLAGS = -I$(RWINLIB)/include
-OPENSSL_LIBS = -L$(RWINLIB)/$(TARGET) -L$(RWINLIB)/lib -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
-endif
+OPENSSL_LIBS = -L$(RWINLIB)/$(TARGET) -L$(RWINLIB)/lib -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32
+
 
 STATLIB = bcrypt/libstatbcrypt.a
 LIBBCRYPT = bcrypt/bcrypt_pbkdf.o bcrypt/blowfish.o