Skip to content

Commit 844decf

Browse files
committed
drop --with-libxml-dir
1 parent c2396e3 commit 844decf

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

README.INSTALLATION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ Then you can pass libcurl prefix to the configure script for CURL and LIBXML res
9393
during the configuration phase as shown here :
9494

9595
export PKG_CONFIG_PATH=/root/custom/software
96-
./configure --enable-solr --with-libxml-dir=/root/custom/software
96+
export PATH=$PATH:/root/custom/software/bin
97+
./configure --enable-solr
9798

9899
If you already have the latest versions of the libraries then the step listed in 4A alone is sufficient.
99100

config.m4

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ PHP_ARG_ENABLE(solr, whether to enable the Solr extension,
66
PHP_ARG_ENABLE(solr-debug, whether to compile with solr in verbose mode,
77
[ --enable-solr-debug Compile with solr in verbose mode], no, no)
88

9-
dnl Configuring the LibXML external Library
10-
if test -z "$PHP_LIBXML_DIR"; then
11-
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
12-
[ --with-libxml-dir=[DIR] SOLR : libxml2 install prefix], no, no)
13-
fi
14-
159
PHP_ARG_ENABLE(coverage, whether to enable code coverage,
1610
[ --enable-coverage Enable developer code coverage information],, no)
1711

@@ -58,6 +52,8 @@ if test "$PHP_SOLR" != "no"; then
5852
AC_MSG_ERROR([Solr extension requires json or jsonc support])
5953
fi
6054

55+
dnl until PHP 7.3: xml2-config or pkg-config
56+
dnl since PHP 7.4: pkg-config only
6157
PHP_SETUP_LIBXML(SOLR_SHARED_LIBADD, [
6258
AC_DEFINE(HAVE_SOLR, 1,[Setting the value of HAVE_SOLR to 1 ])
6359

0 commit comments

Comments
 (0)