Kaydet (Commit) b6d246ea authored tarafından David Tardon's avatar David Tardon

fix build with system gpgmepp

Change-Id: If0c81f5095b61d41b90db2e596bf5905b15ab506
Reviewed-on: https://gerrit.libreoffice.org/45210Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst c79afbe1
......@@ -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@
......
......@@ -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)
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment