diff --git a/src/Makefile.am b/src/Makefile.am index ab2aa304..f4bcfeef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ CXXFLAGS ?= @CXXFLAGS@ LIBXAPIAN=@LIBXAPIAN@ XAPIANCXXFLAGS=@XAPIANCXXFLAGS@ XSLT_CFLAGS=@XSLT_CFLAGS@ -XSLT_LINKADD=@XSLT_LINKADD@ +XSLT_LIBS=@XSLT_LIBS@ LIBICONV=@LIBICONV@ INCICONV=@INCICONV@ LIBFAM = @LIBFAM@ @@ -281,7 +281,7 @@ AM_YFLAGS = -d librecoll_la_LDFLAGS = -release $(VERSION) \ -Wl,--no-undefined -Wl,--warn-unresolved-symbols -librecoll_la_LIBADD = $(XSLT_LINKADD) $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS) +librecoll_la_LIBADD = $(XSLT_LIBS) $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS) # There is probably a better way to do this. The KIO needs to be linked # with librecoll, but librecoll is installed into a non-standard place diff --git a/src/configure.ac b/src/configure.ac index bc6dfb15..85c6ca73 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -343,19 +343,7 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags` #echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS -XSLT_CONFIG=${XSLT_CONFIG:-no} -if test "$XSLT_CONFIG" = "no"; then - AC_PATH_PROG(XSLT_CONFIG0, [xslt-config], no) - XSLT_CONFIG=$XSLT_CONFIG0 -fi -if test "$XSLT_CONFIG" = "no" ; then - AC_MSG_ERROR([Cannot find xslt-config command in $PATH. Is -libxslt installed ?]) - exit 1 -fi - -XSLT_CFLAGS=`xslt-config --cflags` -XSLT_LINKADD=`xslt-config --libs` +PKG_CHECK_MODULES([XSLT], [libxslt], [], AC_MSG_ERROR([libxslt])) AC_ARG_ENABLE(xadump, AC_HELP_STRING([--enable-xadump], @@ -564,7 +552,7 @@ AC_SUBST(LIBQZEITGEIST) AC_SUBST(RCLVERSION) AC_SUBST(RCLLIBVERSION) AC_SUBST(XSLT_CFLAGS) -AC_SUBST(XSLT_LINKADD) +AC_SUBST(XSLT_LIBS) AC_CONFIG_FILES([Makefile python/recoll/setup.py python/pychm/setup.py])