diff options
| author | Rene Engelhard <rene@debian.org> | 2022-08-24 09:55:33 +0200 |
|---|---|---|
| committer | René Engelhard <rene@debian.org> | 2022-08-25 12:06:11 +0200 |
| commit | aa0b2b756c17d43d2e8c828a909ee2815e332377 (patch) | |
| tree | 814d547e782737e113adcee122c080f6ce7e313b /configure.ac | |
| parent | 8845009d81c50bd34947a84b6508a2f9065a299b (diff) | |
Make configure work with gpgme >= 1.18
Sam James wrote:
> gpgme-1.18.0 dropped a bunch of internal symbols,
> including progress_callback (see e.g. callbacks.h
> which has a comment at the top saying it's internal).
Plausibly the workaround to not link against older KDE-specific distro
packages is not needed anymore.
Check for main as a workaround as we do for other C++ libraries, too.
Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
Tested-by: Jenkins
Reviewed-by: Sam James <sam@gentoo.org>
Reviewed-by: René Engelhard <rene@debian.org>
(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553
Tested-by: René Engelhard <rene@debian.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e5d202bfe82f..94f1224df8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) - # progress_callback is the only func with plain C linkage - # checking for it also filters out older, KDE-dependent libgpgmepp versions - AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], - [AC_MSG_ERROR(gpgmepp not found or not functional)], []) AC_CHECK_HEADER(gpgme.h, [], [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) + AC_CHECK_LIB(gpgmepp, main, [], + [AC_MSG_ERROR(gpgmepp not found or not functional)], []) + GPGMEPP_LIBS=-lgpgmepp else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" |