[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 05a4ca26a66fbcce879a313e827863c0267cb7c8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 5 10:49:25 2013 +0200

    We don't build NSS for iOS and Android
    
    Change-Id: Ice999350f91f6cde82d6a55e9ca470378d41c61f

diff --git a/configure.ac b/configure.ac
index 1c569af..3a398e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8784,6 +8784,10 @@ 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)