diff options
| author | Vlad Glagolev | 2015-12-25 13:03:05 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-12-25 13:03:05 +0300 |
| commit | 0cc96e3c33284b07147da81b49a47efe07815c8e (patch) | |
| tree | 7d74c18f445e05b3b1b90ae9a14327450d4788e0 /e-17 | |
| parent | 50f529e7e5b31f3e2d815f14cf900b148e55d7b2 (diff) | |
Revert "ecore: depends SSL"
This reverts commit 7fb0323bbb0299768af8f47cccaac9c7b7fa115e.
Conflicts:
e-17/ecore/HISTORY
Diffstat (limited to 'e-17')
| -rwxr-xr-x | e-17/ecore/DEPENDS | 6 | ||||
| -rw-r--r-- | e-17/ecore/HISTORY | 4 |
2 files changed, 3 insertions, 7 deletions
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 <sobukus@sourcemage.org> * DETAILS: Updated to 1.7.10 (removed guru sig) -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL - 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.8 |