[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configure.ac

[Michael Stahl]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7310841ade1a5065441d32f8b342904c5ace9ea9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 10 16:49:14 2016 +0200

    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/29676
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 856ef4c..3862386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7948,7 +7948,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