[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac Repository.mk sc/Library_sc.mk

[Andras Timar]

 Repository.mk    |    2 +-
 configure.ac     |    6 +++---
 sc/Library_sc.mk |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 1b215d42075ca7cb6afb50cde59261664f9ba545
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Dec 21 13:44:51 2013 -0800

    build fix
    
    Change-Id: I6a2e8e69106584b6b7c9af35d4e0e79bf6ef5342

diff --git a/Repository.mk b/Repository.mk
index eb02ae3..3977ac3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -157,7 +157,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
 	scd \
 	scfilt \
 	scui \
-	solver \
+	$(if $(MPL_SUBSET),,solver) \
 	$(if $(ENABLE_OPENCL),scopencl) \
 	$(if $(DISABLE_SCRIPTING),,vbaobj) \
 	$(if $(ENABLE_TELEPATHY),tubes) \
diff --git a/configure.ac b/configure.ac
index 8c08b1e..c3b6918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9128,7 +9128,7 @@ AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
 # Obviously no such thing on iOS or Android. Also not possible when building
 # 64-bit OS X code as the plugin code uses QuickTime and Carbon.
 if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \) -a \
-        "$enable_headless" != yes
+        "$enable_headless" != yes -a "$enable_mpl_subset" != yes
 then
     AC_MSG_RESULT([yes])
     ENABLE_NPAPI_FROM_BROWSER=TRUE
@@ -9142,8 +9142,8 @@ dnl ===================================================================
 dnl Check for NPAPI interface to plug LibreOffice into browser windows
 dnl ===================================================================
 AC_MSG_CHECKING([whether to plug LibreOffice into browser windows])
-if test "$_os" = WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \
-        "$enable_headless" != yes -a "$enable_gtk" != no
+if test "$enable_mpl_subset" != yes -a \( "$_os" = WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \
+        "$enable_headless" != yes -a "$enable_gtk" != no \)
 then
     AC_MSG_RESULT([yes])
     ENABLE_NPAPI_INTO_BROWSER=TRUE
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 791752f..efdea71 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -331,7 +331,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
     sc/source/ui/Accessibility/AccessibleCellBase \
     sc/source/ui/Accessibility/AccessibleContextBase \
     sc/source/ui/Accessibility/AccessibleCsvControl \
-    sc/source/ui/Accessibility/AccessibleDataPilotControl \
+    $(if $(filter TRUE,$(MPL_SUBSET)),, \
+    sc/source/ui/Accessibility/AccessibleDataPilotControl) \
     sc/source/ui/Accessibility/AccessibleDocument \
     sc/source/ui/Accessibility/AccessibleDocumentBase \
     sc/source/ui/Accessibility/AccessibleDocumentPagePreview \