clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext/xml: Use PKG_CHECK_MODULES to detect the Expat library

Browse Source
This commit is contained in:
Hugh McMaster 2019-05-26 19:30:54 +10:00 committed by Nikita Popov
parent 62ded6efbc
commit a8f4e8fe73
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UPGRADING
View File

@ -545,6 +545,8 @@ The following extensions and SAPIs are affected:
- Libxml:
. --with-libxml-dir has been removed.
. --enable-libxml becomes --with-libxml.
. --with-libexpat-dir has been renamed to --with-expat and no longer
accepts a directory.
- LiteSpeed:
. --with-litespeed becomes --enable-litespeed.

33
ext/xml/config.m4
View File

@ -4,19 +4,19 @@ PHP_ARG_ENABLE([xml],
[Disable XML support])],
[yes])
PHP_ARG_WITH([libexpat-dir],
[libexpat install dir],
[AS_HELP_STRING([--with-libexpat-dir=DIR],
[XML: libexpat install prefix (deprecated)])],
PHP_ARG_WITH([expat],
[whether to build with expat support],
[AS_HELP_STRING([--with-expat],
[XML: use expat instead of libxml2])],
[no],
[no])
if test "$PHP_XML" != "no"; then
dnl
dnl Default to libxml2 if --with-libexpat-dir is not used.
dnl Default to libxml2 if --with-expat is not specified.
dnl
if test "$PHP_LIBEXPAT_DIR" = "no"; then
if test "$PHP_EXPAT" = "no"; then
if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([XML extension requires LIBXML extension, add --with-libxml])
@ -26,25 +26,12 @@ if test "$PHP_XML" != "no"; then
xml_extra_sources="compat.c"
PHP_ADD_EXTENSION_DEP(xml, libxml)
])
fi
else
PKG_CHECK_MODULES([EXPAT], [expat])
dnl
dnl Check for expat only if --with-libexpat-dir is used.
dnl
if test "$PHP_LIBEXPAT_DIR" != "no"; then
for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
EXPAT_DIR=$i
break
fi
done
PHP_EVAL_INCLINE($EXPAT_CFLAGS)
PHP_EVAL_LIBLINE($EXPAT_LIBS, XML_SHARED_LIBADD)
if test -z "$EXPAT_DIR"; then
AC_MSG_ERROR([not found. Please reinstall the expat distribution.])
fi
PHP_ADD_INCLUDE($EXPAT_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$PHP_LIBDIR, XML_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
fi