tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use pkg-config to look for libxslt

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-01-14 19:30:39 +01:00
parent a74205463f
commit df14984f70
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -11,7 +11,7 @@ CXXFLAGS ?= @CXXFLAGS@
LIBXAPIAN=@LIBXAPIAN@ LIBXAPIAN=@LIBXAPIAN@
XAPIANCXXFLAGS=@XAPIANCXXFLAGS@ XAPIANCXXFLAGS=@XAPIANCXXFLAGS@
XSLT_CFLAGS=@XSLT_CFLAGS@ XSLT_CFLAGS=@XSLT_CFLAGS@
XSLT_LINKADD=@XSLT_LINKADD@ XSLT_LIBS=@XSLT_LIBS@
LIBICONV=@LIBICONV@ LIBICONV=@LIBICONV@
INCICONV=@INCICONV@ INCICONV=@INCICONV@
LIBFAM = @LIBFAM@ LIBFAM = @LIBFAM@
@ -281,7 +281,7 @@ AM_YFLAGS = -d
librecoll_la_LDFLAGS = -release $(VERSION) \ librecoll_la_LDFLAGS = -release $(VERSION) \
-Wl,--no-undefined -Wl,--warn-unresolved-symbols -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 # 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 # with librecoll, but librecoll is installed into a non-standard place

16
src/configure.ac
View File

@ -343,19 +343,7 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS #echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
XSLT_CONFIG=${XSLT_CONFIG:-no} PKG_CHECK_MODULES([XSLT], [libxslt], [], AC_MSG_ERROR([libxslt]))
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`
AC_ARG_ENABLE(xadump, AC_ARG_ENABLE(xadump,
AC_HELP_STRING([--enable-xadump], AC_HELP_STRING([--enable-xadump],
@ -564,7 +552,7 @@ AC_SUBST(LIBQZEITGEIST)
AC_SUBST(RCLVERSION) AC_SUBST(RCLVERSION)
AC_SUBST(RCLLIBVERSION) AC_SUBST(RCLLIBVERSION)
AC_SUBST(XSLT_CFLAGS) AC_SUBST(XSLT_CFLAGS)
AC_SUBST(XSLT_LINKADD) AC_SUBST(XSLT_LIBS)
AC_CONFIG_FILES([Makefile python/recoll/setup.py AC_CONFIG_FILES([Makefile python/recoll/setup.py
python/pychm/setup.py]) python/pychm/setup.py])