diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 13:19:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 14:20:47 +0000 |
| commit | 8092d344fa8cf9af692bc4e0ea544738a299b835 (patch) | |
| tree | 466efa641d64e6ebf43840609a6aa50032276f31 /configure.ac | |
| parent | 862ae89a14e6052fd0ff91ee4c143c35829f8e01 (diff) | |
use new ENABLE_NSS for code which needs nss
which isn't available on a static-only build (iOS and fuzzing) and
android
Change-Id: I99bb7c0b45d4499579ddf73f469a762ddcae99ab
Reviewed-on: https://gerrit.libreoffice.org/32182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index c45c44a9dab6..71462316b73d 100644 --- a/configure.ac +++ b/configure.ac @@ -8990,6 +8990,28 @@ fi AC_SUBST(SYSTEM_OPENLDAP) dnl =================================================================== +dnl Check for system NSS +dnl =================================================================== +if test $_os != iOS -a $_os != Android -a "$enable_fuzzers" != "yes"; then + libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) + AC_DEFINE(HAVE_FEATURE_NSS) + ENABLE_NSS="TRUE" + AC_DEFINE(ENABLE_NSS) +else + with_tls=openssl +fi +if test "$with_system_nss" = "yes"; then + libo_MINGW_CHECK_DLL([libnspr4]) + libo_MINGW_CHECK_DLL([libplc4]) + libo_MINGW_CHECK_DLL([libplds4]) + libo_MINGW_CHECK_DLL([nss3]) + libo_MINGW_CHECK_DLL([nssutil3]) + libo_MINGW_CHECK_DLL([smime3]) + libo_MINGW_CHECK_DLL([ssl3]) +fi +AC_SUBST(ENABLE_NSS) + +dnl =================================================================== dnl Check for TLS/SSL and cryptographic implementation to use dnl =================================================================== AC_MSG_CHECKING([which TLS/SSL and cryptographic implementation to use]) @@ -9018,10 +9040,6 @@ nss - Mozilla's Network Security Services (NSS) ]) ;; esac -elif test $_os = iOS -o $_os = Android; then - # We don't build NSS for iOS and Android - AC_DEFINE(USE_TLS_OPENSSL) - TLS=OPENSSL else # default to using NSS, it results in smaller oox lib AC_DEFINE(USE_TLS_NSS) @@ -9031,23 +9049,6 @@ AC_MSG_RESULT([$TLS]) AC_SUBST(TLS) dnl =================================================================== -dnl Check for system NSS -dnl =================================================================== -if test $_os != iOS -a "$enable_fuzzers" != "yes"; then - libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) - AC_DEFINE(HAVE_FEATURE_NSS) -fi -if test "$with_system_nss" = "yes"; then - libo_MINGW_CHECK_DLL([libnspr4]) - libo_MINGW_CHECK_DLL([libplc4]) - libo_MINGW_CHECK_DLL([libplds4]) - libo_MINGW_CHECK_DLL([nss3]) - libo_MINGW_CHECK_DLL([nssutil3]) - libo_MINGW_CHECK_DLL([smime3]) - libo_MINGW_CHECK_DLL([ssl3]) -fi - -dnl =================================================================== dnl Check for system sane dnl =================================================================== AC_MSG_CHECKING([which sane header to use]) |