simplify config.m4 as PHP 7.4 is required #71
Conversation
remicollet
commented
Jan 12, 2024
remicollet
commented
- use PKG_CHECK_MODULES (php < 7.4 is not supported)
- cleanup PHP_SETUP_LIBXML (no need for dependent action, defaults are fine)
- cleanup PHP version check (php 5 is not supported for a long time)
| @@ -93,7 +93,6 @@ Then you can pass libcurl prefix to the configure script for CURL and LIBXML res | |||
| during the configuration phase as shown here : | |||
|
|
|||
| export PKG_CONFIG_PATH=/root/custom/software/lib/pkgconfig | |||
| export PATH=$PATH:/root/custom/software/bin | |||
There was a problem hiding this comment.
Only needed to find xml2-config, which is no more used (pkg-config only)
| @@ -115,7 +82,4 @@ if test "$PHP_SOLR" != "no"; then | |||
| $ext_shared,, [$COVERAGE_CFLAGS]) | |||
| PHP_ADD_BUILD_DIR($abs_builddir/$subdir, 1) | |||
| PHP_SUBST(SOLR_SHARED_LIBADD) | |||
| ], [ | |||
| AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) | |||
| ]) | |||
There was a problem hiding this comment.
Already raised by PHP_SETUP_LIBXML
There was a problem hiding this comment.
shouldn't we have a check for libxml like curl?
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl
There was a problem hiding this comment.
I see, so PHP_SETUP_LIBXML, would do the check for the actual libxml2 ?
There was a problem hiding this comment.
yes, PHP_SETUP_LIBXML is enough (and xml2-config is no more used, since 7.4)
remicollet
force-pushed
the
issue-config-m4
branch
from
42ae79a to
1ea6495
Compare
config.m4
Outdated
| @@ -1,33 +1,18 @@ | |||
| dnl config.m4 for the solr extension | |||
|
|
|||
| PHP_ARG_ENABLE(solr, whether to enable the Solr extension, | |||
| [ --enable-solr Enable solr support]) | |||
| [AS_HELP_STRING([--enable-solr], [Enable solr support])]) | |||
There was a problem hiding this comment.
ensure everything is properly aligned
|
@remicollet please resolve the conflicts |
remicollet
force-pushed
the
issue-config-m4
branch
from
1ea6495 to
def542b
Compare
|
Rebased |
|
@remicollet shouldn't we have a check for libxml like curl? |
| @@ -115,7 +82,4 @@ if test "$PHP_SOLR" != "no"; then | |||
| $ext_shared,, [$COVERAGE_CFLAGS]) | |||
| PHP_ADD_BUILD_DIR($abs_builddir/$subdir, 1) | |||
| PHP_SUBST(SOLR_SHARED_LIBADD) | |||
| ], [ | |||
| AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) | |||
| ]) | |||
There was a problem hiding this comment.
shouldn't we have a check for libxml like curl?
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl
