[Libreoffice-commits] core.git: config_host.mk.in configure.ac xmlsecurity/Library_xsec_xmlsec.mk

[David Tardon]

 config_host.mk.in                  |    1 +
 configure.ac                       |    2 ++
 xmlsecurity/Library_xsec_xmlsec.mk |    4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b6d246ea170c076edea66107af2543ebc0782638
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Nov 24 10:43:04 2017 +0100

    fix build with system gpgmepp
    
    Change-Id: If0c81f5095b61d41b90db2e596bf5905b15ab506
    Reviewed-on: https://gerrit.libreoffice.org/45210
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 0b9528fa6569..804d18766ad3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -127,6 +127,7 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
 export ENABLE_GIO=@ENABLE_GIO@
+export ENABLE_GPGMEPP=@ENABLE_GPGMEPP@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
 export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@
 export ENABLE_GTK3=@ENABLE_GTK3@
diff --git a/configure.ac b/configure.ac
index 5e50660f7aea..d02f935a2bd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10171,8 +10171,10 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
             LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
         fi
     fi
+    ENABLE_GPGMEPP=TRUE
     AC_DEFINE([GPGME_HAVE_GPGME])
 fi
+AC_SUBST(ENABLE_GPGMEPP)
 AC_SUBST(SYSTEM_GPGMEPP)
 AC_SUBST(GPG_ERROR_CFLAGS)
 AC_SUBST(GPG_ERROR_LIBS)
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 3e9f1633070a..ee2f9da7bb1b 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
 	libxml2 \
 	xmlsec \
 ))
-ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),)
+ifeq ($(ENABLE_GPGMEPP),TRUE)
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
 	gpgmepp \
 ))
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/xmlsec/nss/xsec_nss \
 ))
 
-ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),)
+ifeq ($(ENABLE_GPGMEPP),TRUE)
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
 	xmlsecurity/source/gpg/CertificateImpl \
 	xmlsecurity/source/gpg/CipherContext \