From 2840bc523e71ffcadfc1394994b513b672d4dbe8 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 16 Nov 2016 02:40:03 +0800 Subject: Detect openssl to support https when using curl. --- Makerules | 7 ++++++- Makethird | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makerules b/Makerules index fdee2d88..8a17d779 100644 --- a/Makerules +++ b/Makerules @@ -117,8 +117,13 @@ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" HAVE_CURL = yes SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) +ifeq "$(shell pkg-config --exists openssl && echo yes)" "yes" +HAVE_OPENSSL_SSL = yes +SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) +SYS_CURL_DEPS += $(shell pkg-config --libs openssl) endif -SYS_CURL_DEPS = -lpthread -lrt +endif +SYS_CURL_DEPS += -lpthread -lrt ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" HAVE_X11 = yes diff --git a/Makethird b/Makethird index a4c15dde..3faca52f 100644 --- a/Makethird +++ b/Makethird @@ -640,6 +640,9 @@ $(CURL_OUT): CRL_CFLAGS := -DHAVE_CONFIG_H -DBUILDING_LIBCURL -DCURL_STATICLIB \ -DCURL_DISABLE_LDAP -I$(CURL_DIR)/include -I$(CURL_DIR)/lib +ifeq "$(HAVE_OPENSSL_SSL)" "yes" +CRL_CFLAGS += -DUSE_OPENSSL +endif $(CURL_OUT)/%.o: $(CURL_DIR)/lib/%.c | $(CURL_OUT) $(CC_CMD) $(CRL_CFLAGS) -- cgit v1.2.3