diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-10 16:49:14 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-23 22:17:11 +0200 |
| commit | ae906545c664083f5917fbecd1f2d4caa1e61720 (patch) | |
| tree | 95c6f9711777c4dc2dd62c8f3be9435eefa61503 /configure.ac | |
| parent | f42698e76d4cfd184d25768ddbd92e0968b6f12e (diff) | |
configure: avoid linking against libgcrypt for libexslt
There are at least 2 different versions libgcrypt.so.20 and
libgcrypt.so.11 in use, and it's a private dependency of libexslt
anyway, so filter this out of LIBEXSLTLIBS.
Change-Id: Iafc33ef5ead2a86bedb4d5e485f6a16eb0544686
(cherry picked from commit 69dcc7adae5c531b4da8c099bd1e2f99b851ebcd)
Reviewed-on: https://gerrit.libreoffice.org/29677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit dea5ac15555ce2cbc8866f0511ed9d26156c9928)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a0354cd762a3..1b8abe177cc2 100644 --- a/configure.ac +++ b/configure.ac @@ -7870,7 +7870,7 @@ if test "$with_system_libxml" = "yes"; then PKG_CHECK_MODULES(LIBEXSLT, libexslt) LIBEXSLT_CFLAGS=$(printf '%s' "$LIBEXSLT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${LIBEXSLT_LIBS}" - LIBEXSLT_LIBS="${filteredlibs}" + LIBEXSLT_LIBS=$(printf '%s' "${filteredlibs}" | sed -e "s/-lgpg-error//" -e "s/-lgcrypt//") fi dnl Check for xsltproc |