From 1cfef3579b0880f1479387da526ea6ab425ef0d6 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 27 Nov 2013 22:48:41 +0200 Subject: [PATCH] configure: add enable options for NSS and OpenSSL The user can now choose to ignore NSS and use OpenSSL instead during configure time. --disable-openssl doesn't make much sense right now but maybe we'll get another crypto backend implementation in the future :-) --- configure.ac | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index c9723a2a..4edb6c18 100644 --- a/configure.ac +++ b/configure.ac @@ -223,21 +223,43 @@ AS_IF([test "x$ac_have_gmime" = xyes], [AC_DEFINE(HAVE_GMIME, 1, [Define if gmime should be used in sipe.])]) dnl check for NSS -PKG_CHECK_MODULES(NSS, [nss], +AC_ARG_ENABLE(nss, + [AS_HELP_STRING([--enable-nss], + [use NSS as crypto backend @<:@default=yes@:>@])], [], - [PKG_CHECK_MODULES(NSS, [mozilla-nss], + [enable_nss=yes]) +AS_IF([test "x$enable_nss" != xno], + [PKG_CHECK_MODULES(NSS, [nss], [], - [PKG_CHECK_MODULES(NSS, [microb-engine-nss], + [PKG_CHECK_MODULES(NSS, [mozilla-nss], [], - [AC_ERROR([nss, mozilla-nss or microb-engine-nss package is required])]) + [PKG_CHECK_MODULES(NSS, [microb-engine-nss], + [], + [enable_nss=no]) + ]) + ]) ]) -]) -dnl check for OpenSSL - TEMPORARY for development -PKG_CHECK_MODULES(OPENSSL, [libcrypto], - [ac_have_openssl=yes], - [ac_have_openssl=no]) -AM_CONDITIONAL(SIPE_OPENSSL, [test "x$ac_have_openssl" = xyes]) +dnl check for OpenSSL +AC_ARG_ENABLE(openssl, + [AS_HELP_STRING([--enable-openssl], + [use OpenSSL as crypto backend @<:@default=yes@:>@])], + [], + [enable_openssl=yes]) +AS_IF([test "x$enable_openssl" != xno], + [PKG_CHECK_MODULES(OPENSSL, [libcrypto], + [], + [enable_openssl=no]) + ]) +AS_IF( + [test "x$enable_nss" != xno], + [ dnl NSS has priority over OpenSSL + enable_openssl=no + AC_MSG_NOTICE([using NSS as crypto backend.])], + [test "x$enable_openssl" != xno], + [AC_MSG_NOTICE([using OpenSSL as crypto backend.])], + [AC_ERROR([nss, mozilla-nss, microb-engine-nss or libcrypto package is required])]) +AM_CONDITIONAL(SIPE_OPENSSL, [test "x$enable_openssl" != xno]) dnl check for libxml2 PKG_CHECK_MODULES(LIBXML2, [libxml-2.0]) -- 2.11.4.GIT