[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in libxmlsec/makefile.mk

[Pavel Janík]

 configure.in          |    2 +-
 libxmlsec/makefile.mk |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5fe69a4407cdf53f22c38ae4405b3243fa955171
Author: Pavel Janík <paveljanik at apache.org>
Date:   Sat Nov 9 11:45:55 2013 +0000

    WITH_MOZILLA is not used anymore.

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 70b74e4..f1960c2 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -31,9 +31,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(WITH_MOZILLA)" == "NO"
+.IF "$(ENABLE_NSS_MODULE)" == "NO"
 @all:
-    @echo "Mozilla disabled -> no nss -> no libxmlsec...."
+    @echo "No nss -> no libxmlsec...."
 .ENDIF
 
 # --- Files --------------------------------------------------------
commit 3900f6efd06107bf4d07ca7e04d3f5c10d0444c1
Author: Pavel Janík <paveljanik at apache.org>
Date:   Sat Nov 9 11:45:14 2013 +0000

    Proper feature name.

diff --git a/configure.in b/configure.in
index fffff79..b1bc76a 100644
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,7 @@ AC_ARG_ENABLE(static-gtk,
 AC_ARG_ENABLE(layout,
 [  --enable-layout         Enable the compilation and use of layout dialogs
 ],,)
-AC_ARG_ENABLE(nss_module,
+AC_ARG_ENABLE(nss-module,
 [  --disable-nss-module    Whether to use the NSS module that is used for xml-security    
 ],,enable_nss_module=yes)
 AC_ARG_ENABLE(kde,