summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2016-02-19 21:03:42 +0100
committerAttila Molnar <attilamolnar@hush.com>2016-02-19 21:03:42 +0100
commit2e4b6efa9d8d0283a646f5d4f5778a149043fb8c (patch)
tree83f880d5bdc98e139dc3f620073f42d54a0292cd
parenta876f2c58e2f6f2602ed27da09a6e9c40008a80c (diff)
parent8f9ae4c55ec40fa92c229ba1c51c925cb2b6c3ce (diff)
Merge pull request #1133 from SaberUK/master+tempfix
Fix the temporary fix for finding SSL libraries.
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index ab2d50a86..ef6846e50 100755
--- a/configure
+++ b/configure
@@ -297,8 +297,8 @@ if (prompt_bool $interactive, $question, 0) {
} else {
# TODO: finish modulemanager rewrite and replace this code with:
# system './modulemanager', 'enable', '--auto';
- enable_extras 'm_ssl_gnutls.cpp' unless system 'gnutls-cli --version >/dev/null 2>&1';
- enable_extras 'm_ssl_openssl.cpp' unless system 'openssl --version >/dev/null 2>&1';
+ enable_extras 'm_ssl_gnutls.cpp' unless system 'pkg-config --exists gnutls >/dev/null 2>&1';
+ enable_extras 'm_ssl_openssl.cpp' unless system 'pkg-config --exists openssl >/dev/null 2>&1';
}
# Generate SSL certificates.