1From 0551f2e5eb4143be0aacc0185cdc4afc9ca80204 Mon Sep 17 00:00:00 2001 2From: Martin Bark <martin@barkynet.com> 3Date: Fri, 6 May 2016 14:48:49 +0100 4Subject: [PATCH] auto/lib/libgd/conf: use pkg-config 5 6Change to using pkg-config to find the path to libgd 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[Fabrice: use pkg-config instead of gdlib-config] 13Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14--- 15 auto/lib/libgd/conf | 4 ++-- 16 1 file changed, 2 insertions(+), 2 deletions(-) 17 18diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf 19index 67863976..1a4379a5 100644 20--- a/auto/lib/libgd/conf 21+++ b/auto/lib/libgd/conf 22@@ -7,8 +7,9 @@ 23 ngx_feature_name= 24 ngx_feature_run=no 25 ngx_feature_incs="#include <gd.h>" 26- ngx_feature_path= 27- ngx_feature_libs="-lgd" 28+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib| 29+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" 30+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)" 31 ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); 32 (void) img" 33 . auto/feature 34-- 352.11.0 36 37