2a59854aa7
Changed [PATCH x/y] to [PATCH] at the beginning of the subject line since the numbering is meaningless. Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Martin Bark <martin@barkynet.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 211b9f19a3a62826fadef55d2f89d6f66fbf4aa6 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Martin <s.martin49@gmail.com>
|
|
Date: Thu, 29 May 2014 19:22:27 +0200
|
|
Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config
|
|
|
|
Change to using pkg-config to find the path to libxslt and its
|
|
dependencies.
|
|
|
|
Signed-off-by: Martin Bark <martin@barkynet.com>
|
|
---
|
|
auto/lib/libxslt/conf | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
|
|
index 3a0f37b..3c2a60e 100644
|
|
--- a/auto/lib/libxslt/conf
|
|
+++ b/auto/lib/libxslt/conf
|
|
@@ -12,8 +12,8 @@
|
|
#include <libxslt/xsltInternals.h>
|
|
#include <libxslt/transform.h>
|
|
#include <libxslt/xsltutils.h>"
|
|
- ngx_feature_path="/usr/include/libxml2"
|
|
- ngx_feature_libs="-lxml2 -lxslt"
|
|
+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')"
|
|
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
|
|
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
|
|
xsltStylesheetPtr sheet = NULL;
|
|
xmlDocPtr doc;
|
|
--
|
|
2.8.2
|
|
|