78dae8b20b
* remove GPGME_CAN_EXPORT_MINIMAL_KEY, upstream now has support for key export flags in c++ wrapper (gpgmepp >= 1.14) * therefore, external/gpgmepp/add-minimal-keyexport.patch now fully obsolete, tweaked xmlsecurity code to use upstream function * bits of external/gpgmepp/find-libgpg-error-libassuan.patch are upstream now (configure and makefile pieces, though we keep configure.ac changes for the while - to not pick up system versions too easily) * external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 was from upstream anyway, removed Change-Id: I991c20c0eeff0f9135e97c991afcb905be55a959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127665 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index f28480b..92a3e85 100644
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -674,15 +674,34 @@ AC_CHECK_FUNCS(setlocale)
|
|
|
|
# Checking for libgpg-error.
|
|
have_gpg_error=no
|
|
-AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
|
|
- have_gpg_error=yes, have_gpg_error=no)
|
|
+if test "x${GPG_ERROR_CFLAGS}" = x; then
|
|
+ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
|
|
+ have_gpg_error=yes, have_gpg_error=no)
|
|
+else
|
|
+ have_gpg_error=yes
|
|
+ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS"
|
|
+ GPG_ERROR_LIBS="$GPG_ERROR_LIBS"
|
|
+ AC_SUBST(GPG_ERROR_CFLAGS)
|
|
+ AC_SUBST(GPG_ERROR_LIBS)
|
|
+
|
|
+fi
|
|
+
|
|
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
|
|
[The default error source for GPGME.])
|
|
|
|
# And for libassuan.
|
|
have_libassuan=no
|
|
-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
|
|
+if test "x${LIBASSUAN_CFLAGS}" = x; then
|
|
+ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
|
|
have_libassuan=yes, have_libassuan=no)
|
|
+else
|
|
+ have_libassuan=yes
|
|
+ LIBASSUAN_CFLAGS="$LIBASSUAN_CFLAGS"
|
|
+ LIBASSUAN_LIBS="$LIBASSUAN_LIBS"
|
|
+ AC_SUBST(LIBASSUAN_CFLAGS)
|
|
+ AC_SUBST(LIBASSUAN_LIBS)
|
|
+fi
|
|
+
|
|
if test "$have_libassuan" = "yes"; then
|
|
AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version",
|
|
[version of the libassuan library])
|
|
--- lang/cpp/tests/Makefile.am 2020-06-20 00:43:49.213657887 +0200
|
|
+++ lang/cpp/tests/Makefile.am~ 2019-01-25 13:27:34.000000000 +0100
|
|
@@ -21,7 +21,7 @@
|
|
AM_LDFLAGS = -no-install
|
|
|
|
LDADD = ../../cpp/src/libgpgmepp.la \
|
|
+ ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
|
|
- ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
|
|
@LDADD_FOR_TESTS_KLUDGE@ -lstdc++
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
|
|
--- lang/cpp/tests/Makefile.in 2020-06-20 00:44:49.542344510 +0200
|
|
+++ lang/cpp/tests/Makefile.in~ 2020-06-13 00:55:19.021212970 +0200
|
|
@@ -415,7 +415,7 @@
|
|
top_srcdir = @top_srcdir@
|
|
AM_LDFLAGS = -no-install
|
|
LDADD = ../../cpp/src/libgpgmepp.la \
|
|
+ ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
|
|
- ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
|
|
@LDADD_FOR_TESTS_KLUDGE@ -lstdc++
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
|