From c814fecf3e1cc98856fd909b3e52bf4e38a72bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 5 Feb 2020 19:23:47 +0100 Subject: [PATCH] Add libxslt detection using pkg-config. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 59f924fd3822e5887777a7d3b3f5c5d315ef49ce) --- kipi-plugins/configure.in.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/kipi-plugins/configure.in.in b/kipi-plugins/configure.in.in index ec887b7..49f350a 100644 --- a/kipi-plugins/configure.in.in +++ b/kipi-plugins/configure.in.in @@ -334,14 +334,21 @@ fi have_xslt=no if test "x$build_xslt" != "xno"; then - AC_PATH_PROG(XSLT_CONFIG,xslt-config) - if test -n "${XSLT_CONFIG}"; then - LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`" - AC_SUBST(LIBXSLT_CFLAGS) - LIBXSLT_LIBS="`$XSLT_CONFIG --libs`" - AC_SUBST(LIBXSLT_LIBS) - have_xslt=yes - else + KDE_PKG_CHECK_MODULES(LIBXSLT, libxslt, + have_xslt=yes, have_xslt=no) + + if test "x$have_xslt" != "xyes"; then + AC_PATH_PROG(XSLT_CONFIG,xslt-config) + if test -n "${XSLT_CONFIG}"; then + LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`" + AC_SUBST(LIBXSLT_CFLAGS) + LIBXSLT_LIBS="`$XSLT_CONFIG --libs`" + AC_SUBST(LIBXSLT_LIBS) + have_xslt=yes + fi + fi + + if test "x$have_xslt" != "xyes"; then AC_MSG_WARN([libxslt library not found, some plugins will not be compiled]) fi fi