1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
|
Description: Use pkg-config to detect the libxslt library
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug-Debian: https://bugs.debian.org/948933
Last-Update: 2020-08-29
--- fwbuilder-5.3.7.orig/configure.in
+++ fwbuilder-5.3.7/configure.in
@@ -258,17 +258,7 @@ AC_CHECK_FUNCS(xmlSaveFormatFileEnc)
LIBS=${SAVE_LIBS}
dnl check for XSLT library
-
-AC_ARG_WITH(xslt-config,
- [ --with-xslt-config=xslt-config Specify the xslt-config to be used],
- [ XSLT_CONFIG=$with_xslt_config ],
- [ AC_PATH_PROG(XSLT_CONFIG, xslt-config, ,[$EXTENDED_PATH]) ])
-if test x$XSLT_CONFIG = x ; then
- AC_MSG_ERROR([libxslt not present or not configured])
-else
- XSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
- XSLT_LIBS="`$XSLT_CONFIG --libs`"
-fi
+PKG_CHECK_MODULES([XSLT], [libxslt])
XSLT_CFLAGS=`echo $XSLT_CFLAGS | sed 's/-I\/usr\/include //'`
dnl
@@ -293,9 +283,6 @@ for w in ${XSLT_LIBS}; do
done
XSLT_LIBS=$ac_xslt_var
-AC_SUBST(XSLT_CFLAGS)
-AC_SUBST(XSLT_LIBS)
-
dnl libXslt header libxslt/xsltconfig.h only present in newew version of libxslt
dnl for instance it is not part of 1.0.1 but present in 1.0.7.
AC_CHECK_HEADERS(libxslt/xsltconfig.h)
|