From 172c07013d1ea99447a780fd36f49d5c3a76981b Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Sun, 24 Apr 2011 16:15:04 +0200 Subject: Require openssl-devel is libcrypto backend is selected --- src/external/crypto.m4 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/external/crypto.m4') diff --git a/src/external/crypto.m4 b/src/external/crypto.m4 index d1bcf40a..19a064d3 100644 --- a/src/external/crypto.m4 +++ b/src/external/crypto.m4 @@ -1,13 +1,9 @@ -AC_ARG_ENABLE(crypto, - [ --enable-crypto Use OpenSSL crypto instead of NSS], - [CRYPTO="$enableval"], - [CRYPTO="no"] -) +AC_DEFUN([AM_CHECK_NSS], + [PKG_CHECK_MODULES([NSS],[nss]) + AC_DEFINE_UNQUOTED(HAVE_NSS, 1, [Build with NSS crypto back end]) +]) -if test x$CRYPTO != xyes; then - PKG_CHECK_MODULES([NSS],[nss],[have_nss=1],[have_nss=]) -else - PKG_CHECK_MODULES([CRYPTO],[libcrypto],[have_crypto=1],[have_crypto=]) -fi -AM_CONDITIONAL([HAVE_NSS], [test x$have_nss != x]) -AM_CONDITIONAL([HAVE_CRYPTO], [test x$have_crypto != x]) +AC_DEFUN([AM_CHECK_LIBCRYPTO], + [PKG_CHECK_MODULES([CRYPTO],[libcrypto]) + AC_DEFINE_UNQUOTED(HAVE_LIBCRYPTO, 1, [Build with libcrypt crypto back end]) +]) -- cgit