From 0cc96e3c33284b07147da81b49a47efe07815c8e Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Fri, 25 Dec 2015 13:03:05 +0300 Subject: Revert "ecore: depends SSL" This reverts commit 7fb0323bbb0299768af8f47cccaac9c7b7fa115e. Conflicts: e-17/ecore/HISTORY --- e-17/ecore/DEPENDS | 6 +++--- e-17/ecore/HISTORY | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'e-17') diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS index dc5db308fb..638a0e1aec 100755 --- a/e-17/ecore/DEPENDS +++ b/e-17/ecore/DEPENDS @@ -108,7 +108,7 @@ optional_depends sdl \ "Enable SDL ecore_sdl module?" && if [ "$ECORE_CRYPTO" == "gnutls" ]; then - depends gnutls "--enable-gnutls --disable-SSL" -elif [ "$ECORE_CRYPTO" == "SSL" ]; then - depends SSL "--enable-openssl --disable-gnutls" + depends gnutls "--enable-gnutls --disable-openssl" +elif [ "$ECORE_CRYPTO" == "openssl" ]; then + depends openssl "--enable-openssl --disable-gnutls" fi diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY index 4235ed07dc..600dd8872f 100644 --- a/e-17/ecore/HISTORY +++ b/e-17/ecore/HISTORY @@ -1,10 +1,6 @@ 2014-08-24 Thomas Orgis * DETAILS: Updated to 1.7.10 (removed guru sig) -2014-08-19 Treeve Jelbert - * DEPENDS: openssl => SSL - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL - 2013-07-30 Eric Sandall * DETAILS: Updated to 1.7.8 -- cgit v1.2.3