add --disable-pdfium

Change-Id: I9137dc0030c3c752ffc0931721bf6b0013309d39

7 files changed, 24 insertions, 2 deletions

diff --git a/Makefile.fetch b/Makefile.fetch
index 2544e9b88166..7dedf3b129a7 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -195,7 +195,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \
 		$(call fetch_Optional,OWNCLOUD_ANDROID_LIB,OWNCLOUD_ANDROID_LIB_TARBALL) \
 		$(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
-		PDFIUM_TARBALL \
+		$(call fetch_Optional,PDFIUM,PDFIUM_TARBALL) \
 		$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
 		$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
 		$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
diff --git a/config_host.mk.in b/config_host.mk.in
index c0caf0cf342c..02151ae69abc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -158,6 +158,7 @@ export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
+export ENABLE_PDFIUM=@ENABLE_PDFIUM@
 export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
diff --git a/configure.ac b/configure.ac
index 5f23f29c5412..58ece8aae510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1033,6 +1033,11 @@ libo_FUZZ_ARG_ENABLE(pdfimport,
         [Disable building the PDF import feature.])
 )
 
+libo_FUZZ_ARG_ENABLE(pdfium,
+    AS_HELP_STRING([--disable-pdfium],
+        [Disable building PDFium.])
+)
+
 ###############################################################################
 
 dnl ---------- *** ----------
@@ -10634,6 +10639,18 @@ AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
+# pdf import?
+AC_MSG_CHECKING([whether to build PDFium])
+ENABLE_PDFIUM=
+if test -z "$enable_pdfium" -o "$enable_pdfium" = yes; then
+    AC_MSG_RESULT([yes])
+    ENABLE_PDFIUM=TRUE
+    BUILD_TYPE="$BUILD_TYPE PDFIUM"
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_PDFIUM)
+
 SYSTEM_GPGME=
 if test "$_os" = "Linux"; then
     dnl ===================================================================
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index e1a1d2450d25..a20b3cc1c2fc 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -3,6 +3,7 @@
 --enable-gio
 --without-myspell-dicts
 --disable-ccache
+--disable-pdfium
 --disable-gstreamer-0-10
 --enable-gstreamer-1-0
 --enable-option-checking=fatal
diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
index a58a862271b9..9476647b3573 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -8,6 +8,7 @@
 --disable-gui
 --disable-gtk
 --disable-gtk3
+--disable-pdfium
 --disable-postgresql-sdbc
 --disable-firebird-sdbc
 --disable-coinmp
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 44b24d75d3a3..52950c2686ff 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -88,7 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
 	$(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
-	pdfium \
+	$(call gb_Helper_optional,PDFIUM,pdfium) \
 	$(call gb_Helper_optional,POPPLER,poppler) \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	$(call gb_Helper_optional,PYTHON,$(if $(filter $(PYTHON_VERSION_MINOR),3),python33,python3)) \
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index b14729ffc405..4fca006effeb 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -40,12 +40,14 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq ($(ENABLE_PDFIUM),TRUE)
 
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
     Executable_pdfverify \
 ))
 
 endif
+endif
 
 endif