[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfimport.mk

[Tor Lillqvist]

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

New commits:
commit 2b0320da7b59d2d4c0c5dc5da8424458ce0d819d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Oct 13 10:17:40 2013 +0300

    No vcl.unx component in the ENABLE_HEADLESS case
    
    Such a build passes make but make check fails, though.
    
    No, I am not interested in --enable-headless. (I actually think it is a
    pointless idea.) I just for fun tried such a build, thinking a bit whether the
    LIBO_HEADLESS thing could be replaced by simply !HAVE_FEATURE_DESKTOP,
    i.e. setting the latter to zero for a --enable-headless build. But whatever.
    
    Change-Id: I156f956bd2430ba76934774c7d220a1b9f2019bf

diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index ecaf98b..ee56556 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -75,7 +75,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
     unoxml/source/service/unoxml \
     uui/util/uui \
     $(if $(filter-out MACOSX WNT,$(OS)), \
-		vcl/vcl.unx \
+		$(if $(filter-out TRUE,$(ENABLE_HEADLESS)), \
+			vcl/vcl.unx \
+		) \
     ) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
     xmloff/util/xo \