[Libreoffice-commits] core.git: Repository.mk sd/CppunitTest_sd_import_tests.mk

[Tor Lillqvist]

 Repository.mk                     |    2 ++
 sd/CppunitTest_sd_import_tests.mk |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit baee89d5a068fe950e78e9ec13937f237c5a2c9e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 28 19:13:08 2015 +0300

    Check ENABLE_PDFIMPORT
    
    Change-Id: I1c0e7e5ecfcd62315e367d537cd3e0466b66e48f

diff --git a/Repository.mk b/Repository.mk
index f9a5208..3e3fa85 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -468,9 +468,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
 		postgresql-sdbc-impl) \
 ))
 
+ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
 	pdfimport \
 ))
+endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \
 	pythonloader \
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index b1d20cc..238f133 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -89,7 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
     sd/util/sd \
     sd/util/sdfilt \
     sd/util/sdd \
-    sdext/source/pdfimport/pdfimport \
+    $(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
     sfx2/util/sfx \
     sot/util/sot \
     svl/source/fsstor/fsstorage \
@@ -114,7 +114,9 @@ $(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
 	oox_customshapes \
 ))
 
+ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport))
+endif
 
 $(call gb_CppunitTest_get_target,sd_import_tests) : $(call gb_AllLangResTarget_get_target,sd)