[Libreoffice-commits] .: configure.in

Caolán McNamara caolan at kemper.freedesktop.org
Tue Aug 14 02:22:30 PDT 2012


 configure.in |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 690078182aa82ba41e7da849d0fef271bb55c847
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Aug 13 17:09:45 2012 +0200

    nss is now required unconditionally in vcl
    
    Change-Id: I846c9ef6bf9682ff02f586de6b979845deae6e93

diff --git a/configure.in b/configure.in
index 2fd333e..fc14552 100644
--- a/configure.in
+++ b/configure.in
@@ -7977,9 +7977,8 @@ AC_SUBST(MOZ_LIB)
 AC_SUBST(MOZ_LIB_XPCOM)
 
 dnl ===================================================================
-dnl Check for system NSS only with xmlsec or mozilla build enabled
+dnl Check for system NSS
 dnl ===================================================================
-if test "x$enable_xmlsec" != "xno" -o "x$enable_mozilla" != "xno"; then
 AC_MSG_CHECKING([which NSS to use])
 if test "$with_system_nss" = "yes"; then
     AC_MSG_RESULT([external])
@@ -8013,7 +8012,6 @@ from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
         fi
     fi
 fi # system nss
-fi # enable xmlsec || enable mozilla
 AC_SUBST(SYSTEM_NSS)
 AC_SUBST(NSS_CFLAGS)
 AC_SUBST(NSS_LIBS)


More information about the Libreoffice-commits mailing list