summaryrefslogtreecommitdiff
path: root/ext/xsl
diff options
context:
space:
mode:
authorHugh McMaster <hugh.mcmaster@outlook.com>2019-06-06 22:22:00 +1000
committerNikita Popov <nikita.ppv@gmail.com>2019-06-07 09:35:14 +0200
commitd4c275d8acdc3012da2aef191c1cac1389eaaef8 (patch)
tree0fdc7c4c569623e7501138f9a19853c80f866271 /ext/xsl
parentab66179227dfce5c916592f47a66cd5f09e86359 (diff)
downloadphp-git-d4c275d8acdc3012da2aef191c1cac1389eaaef8.tar.gz
ext/xsl: Use PKG_CHECK_MODULES to detect the EXSLT library
Diffstat (limited to 'ext/xsl')
-rw-r--r--ext/xsl/config.m421
1 files changed, 6 insertions, 15 deletions
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)