[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configure.ac

[Tor Lillqvist]

 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 839336e55038ecdda87613c7e61dfd821a97be91
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 30 17:57:48 2018 +0200

    Avoid GPG when --enable-mpl-subset
    
    Change-Id: I7e41676965b6d98612ae697d65a5644fe0544649
    Reviewed-on: https://gerrit.libreoffice.org/48917
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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 ===================================================================