1*4882a593SmuzhiyunFrom 0551f2e5eb4143be0aacc0185cdc4afc9ca80204 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Martin Bark <martin@barkynet.com> 3*4882a593SmuzhiyunDate: Fri, 6 May 2016 14:48:49 +0100 4*4882a593SmuzhiyunSubject: [PATCH] auto/lib/libgd/conf: use pkg-config 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunChange to using pkg-config to find the path to libgd and its 7*4882a593Smuzhiyundependencies. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Martin Bark <martin@barkynet.com> 10*4882a593Smuzhiyun[Peter: updated for 1.15.6] 11*4882a593SmuzhiyunSigned-off-by: Peter Korsgaard <peter@korsgaard.com> 12*4882a593Smuzhiyun[Fabrice: use pkg-config instead of gdlib-config] 13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun auto/lib/libgd/conf | 4 ++-- 16*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf 19*4882a593Smuzhiyunindex 67863976..1a4379a5 100644 20*4882a593Smuzhiyun--- a/auto/lib/libgd/conf 21*4882a593Smuzhiyun+++ b/auto/lib/libgd/conf 22*4882a593Smuzhiyun@@ -7,8 +7,9 @@ 23*4882a593Smuzhiyun ngx_feature_name= 24*4882a593Smuzhiyun ngx_feature_run=no 25*4882a593Smuzhiyun ngx_feature_incs="#include <gd.h>" 26*4882a593Smuzhiyun- ngx_feature_path= 27*4882a593Smuzhiyun- ngx_feature_libs="-lgd" 28*4882a593Smuzhiyun+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib| 29*4882a593Smuzhiyun+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" 30*4882a593Smuzhiyun+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)" 31*4882a593Smuzhiyun ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); 32*4882a593Smuzhiyun (void) img" 33*4882a593Smuzhiyun . auto/feature 34*4882a593Smuzhiyun-- 35*4882a593Smuzhiyun2.11.0 36*4882a593Smuzhiyun 37