1From 7783d63c87f94797aa134786214b0a84c000be75 Mon Sep 17 00:00:00 2001 2From: Samuel Martin <s.martin49@gmail.com> 3Date: Thu, 29 May 2014 19:22:27 +0200 4Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config 5 6Change to using pkg-config to find the path to libxslt and its 7dependencies. 8 9Signed-off-by: Martin Bark <martin@barkynet.com> 10[Peter: updated for 1.15.6] 11Signed-off-by: Peter Korsgaard <peter@korsgaard.com> 12--- 13 auto/lib/libxslt/conf | 5 +++-- 14 1 file changed, 3 insertions(+), 2 deletions(-) 15 16diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf 17index 3063ac7c..3209e364 100644 18--- a/auto/lib/libxslt/conf 19+++ b/auto/lib/libxslt/conf 20@@ -12,8 +12,9 @@ 21 #include <libxslt/xsltInternals.h> 22 #include <libxslt/transform.h> 23 #include <libxslt/xsltutils.h>" 24- ngx_feature_path="/usr/include/libxml2" 25- ngx_feature_libs="-lxml2 -lxslt" 26+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt| 27+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" 28+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)" 29 ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; 30 xsltStylesheetPtr sheet = NULL; 31 xmlDocPtr doc = NULL; 32-- 332.11.0 34 35