[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk

[Andrzej Hunt]

 desktop/Library_sofficeapp.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 74a0782166c6afd9bd2352e12ef1ce7d4dccaa5c
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Wed Jun 25 13:32:00 2014 +0100

    Add all the required conditions for vclplug_svp.
    
    As per Repository.mk, we only have this on linux AND headless.
    
    Change-Id: I708c89e38a661afb839ab1ac3e48ff9b2ecc040c

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 7edad8e..870a2db 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -53,7 +53,9 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
     ucbhelper \
     utl \
     vcl \
-    $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+    $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+        $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+    ) \
 	$(gb_UWINAPI) \
 ))