0006-auto-lib-libgd-conf-use-pkg-config.patch 1.2 KB

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