summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2019-03-06 22:06:35 -0500
committerAndras Timar <andras.timar@collabora.com>2019-03-07 09:10:27 +0100
commit5b8e16a8ce7738a659fcf8bbe92d6b590dcd3027 (patch)
tree56ae40b00543f85a5cfe38ccfdc8eb1c59859237 /sd
parent6f696fd39cabfe212b60152ff11126817d77b89d (diff)
build: support disabling poppler
This adds --enable-poppler configure option. Poppler can be enabled/disabled by setting this parameter to yes or no. Change-Id: I42ba2d27de7b5014d28523394310616d20073b71 Reviewed-on: https://gerrit.libreoffice.org/68602 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd')
-rwxr-xr-xsd/CppunitTest_sd_activex_controls_tests.mk2
-rw-r--r--sd/CppunitTest_sd_import_tests.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/CppunitTest_sd_activex_controls_tests.mk b/sd/CppunitTest_sd_activex_controls_tests.mk
index 2b42afc1087b..4325651880b5 100755
--- a/sd/CppunitTest_sd_activex_controls_tests.mk
+++ b/sd/CppunitTest_sd_activex_controls_tests.mk
@@ -89,7 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_activex_controls_tests,\
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
- $(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
+ $(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 0307580ac9d7..6e278a5e9530 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -91,7 +91,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
- $(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
+ $(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
@@ -117,7 +117,7 @@ $(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
oox_customshapes \
))
-ifneq ($(ENABLE_PDFIMPORT),)
+ifneq ($(ENABLE_POPPLER),)
$(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport))
endif