From 013ddc4f5307df512767ca23b3922540b2b36d52 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 23 Apr 2021 10:04:29 +0200 Subject: Switch OPENSSL config var from negative to positive - align with most of the rest of config_host - rename DISABLE_OPENSSL to ENABLE_OPENSSL - make this configurable Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- RepositoryExternal.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 12124f1fbbf7..224fd7526bec 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1566,13 +1566,13 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) +ifneq ($(ENABLE_OPENSSL),TRUE) gb_ExternalProject__use_openssl:= gb_LinkTarget__use_openssl_headers:= gb_LinkTarget__use_openssl:= -else # !DISABLE_OPENSSL +else # ENABLE_OPENSSL ifneq ($(SYSTEM_OPENSSL),) @@ -1633,10 +1633,10 @@ endif endef endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL +endif # ENABLE_OPENSSL -ifeq ($(DISABLE_OPENSSL),TRUE) +ifneq ($(ENABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls $(call gb_LinkTarget_set_include,$(1),\ @@ -1662,12 +1662,12 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBGCRYPT_LIBS)) endef -else # !DISABLE_OPENSSL +else # ENABLE_OPENSSL gb_LinkTarget__use_gnutls:= gb_LinkTarget__use_libgcrypt:= -endif # DISABLE_OPENSSL +endif # ENABLE_OPENSSL ifneq ($(SYSTEM_CDR),) -- cgit v1.2.3