From d4c275d8acdc3012da2aef191c1cac1389eaaef8 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Thu, 6 Jun 2019 22:22:00 +1000
Subject: ext/xsl: Use PKG_CHECK_MODULES to detect the EXSLT library

---
 ext/xsl/config.m4 | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'ext/xsl')

diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index ab70ad6b87..14af536fa7 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -18,21 +18,12 @@ if test "$PHP_XSL" != "no"; then
   PHP_EVAL_INCLINE($XSL_CFLAGS)
   PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD)
 
-  AC_MSG_CHECKING([for EXSLT support])
-  for i in /usr/local /usr; do
-    if test -r "$i/include/libexslt/exslt.h"; then
-      PHP_XSL_EXSL_DIR=$i
-      break
-    fi
-  done
-  if test -z "$PHP_XSL_EXSL_DIR"; then
-    AC_MSG_RESULT(not found)
-  else
-    AC_MSG_RESULT(found)
-    PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD)
-    PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include)
-    AC_DEFINE(HAVE_XSL_EXSLT,1,[ ])
-  fi
+  PKG_CHECK_MODULES([EXSLT], [libexslt],
+  [
+    PHP_EVAL_INCLINE($EXSLT_CFLAGS)
+    PHP_EVAL_LIBLINE($EXSLT_LIBS, XSL_SHARED_LIBADD)
+    AC_DEFINE(HAVE_XSL_EXSLT, 1, [ ])
+  ], [ ])
 
   AC_DEFINE(HAVE_XSL,1,[ ])
   PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared)
-- 
cgit v1.2.1