From 276d97cb194f4ed4cacfa44a3b6fba2c3c5cb84a Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 16 Nov 2016 01:40:34 +0800 Subject: Rename openssl flags to libcrypto. Only libcrypto is used to do checking of digital signatures. The SSL library openssl is never used. --- Makerules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index a038ff8f..fdee2d88 100644 --- a/Makerules +++ b/Makerules @@ -76,13 +76,13 @@ else ifeq "$(OS)" "MACOS" HAVE_X11 ?= no HAVE_PTHREADS ?= yes -# Mac OS X deprecated openssl, so the default is to not include it. -HAVE_OPENSSL ?= no -SYS_OPENSSL_CFLAGS = -SYS_OPENSSL_LIBS = -ifeq "$(HAVE_OPENSSL)" "yes" -SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL -SYS_OPENSSL_LIBS = -lcrypto +# Mac OS X deprecated libcrypto, so the default is to not include it. +HAVE_LIBCRYTO ?= no +SYS_LIBCRYPTO_CFLAGS = +SYS_LIBCRYPTO_LIBS = +ifeq "$(HAVE_LIBCRYPTO)" "yes" +SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO +SYS_LIBCRYPTO_LIBS = -lcrypto endif SYS_CURL_DEPS = -lpthread @@ -108,9 +108,9 @@ else ifeq "$(OS)" "Linux" HAVE_PTHREADS ?= yes ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes" -HAVE_OPENSSL = yes -SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto) -SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto) +HAVE_LIBCRYPTO = yes +SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) +SYS_LIBCRYPTO_LIBS = $(shell pkg-config --libs libcrypto) endif ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" -- cgit v1.2.3