add --disable-pdfium

(cherry picked from commit 55e203a0c6c8c6f0c58025efd7c9079e27b438c9)

Conflicts:
configure.ac
distro-configs/LibreOfficeOssFuzz.conf

Change-Id: I9137dc0030c3c752ffc0931721bf6b0013309d39

6 files changed, 23 insertions, 2 deletions

diff --git a/Makefile.fetch b/Makefile.fetch
index 1cf65a75d712..c5eabd2d429c 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -194,7 +194,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 3d39dcddde94..93e942bab0ef 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -161,6 +161,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 23d9adcd475d..0711a700b048 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1035,6 +1035,11 @@ AC_ARG_ENABLE(pdfimport,
         [Disable building the PDF import feature.])
 )
 
+AC_ARG_ENABLE(pdfium,
+    AS_HELP_STRING([--disable-pdfium],
+        [Disable building PDFium.])
+)
+
 ###############################################################################
 
 dnl ---------- *** ----------
@@ -10678,6 +10683,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)
+
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
 if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
     AC_MSG_RESULT([yes])
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index bcbdab2c1d17..3aa17deac635 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/external/Module_external.mk b/external/Module_external.mk
index f4573ffb68e2..d744018fe6db 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -86,7 +86,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 6fdc86eb60f4..36b11f5aca52 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -38,11 +38,13 @@ $(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
 
 # vim: set noet sw=4 ts=4: