Kaydet (Commit) baee89d5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Check ENABLE_PDFIMPORT

Change-Id: I1c0e7e5ecfcd62315e367d537cd3e0466b66e48f
üst 65a34bdc
...@@ -468,9 +468,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \ ...@@ -468,9 +468,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
postgresql-sdbc-impl) \ postgresql-sdbc-impl) \
)) ))
ifneq ($(ENABLE_PDFIMPORT),)
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
pdfimport \ pdfimport \
)) ))
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \
pythonloader \ pythonloader \
......
...@@ -89,7 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\ ...@@ -89,7 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
sd/util/sd \ sd/util/sd \
sd/util/sdfilt \ sd/util/sdfilt \
sd/util/sdd \ sd/util/sdd \
sdext/source/pdfimport/pdfimport \ $(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
sfx2/util/sfx \ sfx2/util/sfx \
sot/util/sot \ sot/util/sot \
svl/source/fsstor/fsstorage \ svl/source/fsstor/fsstorage \
...@@ -114,7 +114,9 @@ $(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\ ...@@ -114,7 +114,9 @@ $(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
oox_customshapes \ oox_customshapes \
)) ))
ifneq ($(ENABLE_PDFIMPORT),)
$(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport)) $(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) $(call gb_CppunitTest_get_target,sd_import_tests) : $(call gb_AllLangResTarget_get_target,sd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment