From 4d2da65b1416e07bd2529ab03d2c32a87041945d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 16 Nov 2016 07:27:59 +0100
Subject: [PATCH 1/2] Use pkg-config instead of deprecated gdlib-config

---
 php/libpuzzle/config.m4 | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/php/libpuzzle/config.m4 b/php/libpuzzle/config.m4
index 84f954a..2d8bbc0 100644
--- a/php/libpuzzle/config.m4
+++ b/php/libpuzzle/config.m4
@@ -6,15 +6,24 @@ PHP_ARG_WITH(libpuzzle, for libpuzzle support,
              [  --with-libpuzzle        Include libpuzzle support])
 
 if test "$PHP_LIBPUZZLE" != "no"; then
-  for i in $PHP_LIBPUZZLE /usr/local /usr; do
-    if test -x "$i/bin/gdlib-config"; then
-      GDLIB_CONFIG=$i/bin/gdlib-config
-      break
-    fi
-  done
-  GDLIB_LIBS=$($GDLIB_CONFIG --ldflags --libs)
-  GDLIB_INCS=$($GDLIB_CONFIG --cflags)
-  
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  AC_PATH_PROG(GDLIB_CONFIG, gdlib-config, no)
+
+  AC_MSG_CHECKING(for libgd)
+  if test -x "$PKG_CONFIG" && $PKG_CONFIG gdlib --exists; then
+    GDLIB_LIBS=$($PKG_CONFIG gdlib --libs)
+    GDLIB_INCS=$($PKG_CONFIG gdlib --cflags)
+    GDLIB_VERS=$($PKG_CONFIG gdlib --modversion)
+    AC_MSG_RESULT(from pkg_config: found $GDLIB_VERS)
+  elif test -x "$GDLIB_CONFIG"; then
+    GDLIB_LIBS=$($GDLIB_CONFIG --ldflags --libs)
+    GDLIB_INCS=$($GDLIB_CONFIG --cflags)
+    GDLIB_VERS=$($GDLIB_CONFIG --version)
+    AC_MSG_RESULT(from gdlib_config: found $GDLIB_VERS)
+  else
+    AC_MSG_ERROR(not found)
+  fi
   PHP_EVAL_LIBLINE($GDLIB_LIBS, LIBPUZZLE_SHARED_LIBADD)
   PHP_EVAL_INCLINE($GDLIB_INCS)
                             
-- 
2.9.3