summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-01-30 17:57:48 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-01-30 21:10:37 +0100
commit839336e55038ecdda87613c7e61dfd821a97be91 (patch)
tree62fcb3c92ef2a3636698bd94a8ab9567f4c9ecb9
parentba30faa87a9b3550103cfe5372640f928c47d8d3 (diff)
Avoid GPG when --enable-mpl-subset
Change-Id: I7e41676965b6d98612ae697d65a5644fe0544649 Reviewed-on: https://gerrit.libreoffice.org/48917 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 54ad2966ed3d..dd97036b40bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10120,7 +10120,9 @@ fi
AC_SUBST(ENABLE_PDFIUM)
SYSTEM_GPGMEPP=
-if test "$_os" = "Linux" -o "$_os" = "Darwin" \
+if test "$enable_mpl_subset" = "yes" ; then
+ :
+elif test "$_os" = "Linux" -o "$_os" = "Darwin" \
-o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
-o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then
dnl ===================================================================