--- a/ext/enchant/config.m4 2022-02-15 21:23:10.000000000 +0800 +++ b/ext/enchant/config.m4 2022-02-18 20:04:42.857433400 +0800 @@ -4,26 +4,38 @@ [Include Enchant support])]) if test "$PHP_ENCHANT" != "no"; then - PKG_CHECK_MODULES([ENCHANT], [enchant]) + PKG_CHECK_MODULES([ENCHANT2], [enchant-2], [found_enchant_2=yes], [found_enchant_2=no]) - PHP_EVAL_INCLINE($ENCHANT_CFLAGS) - PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) + if test "$found_enchant_2" = "yes"; then - AC_DEFINE(HAVE_ENCHANT, 1, [ ]) + PHP_EVAL_INCLINE($ENCHANT2_CFLAGS) + PHP_EVAL_LIBLINE($ENCHANT2_LIBS, ENCHANT_SHARED_LIBADD) + + AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ enchant_get_version since 1.6.0 ]) - PHP_CHECK_LIBRARY(enchant, enchant_get_version, - [ - AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ]) - ], [ ], [ - $ENCHANT_LIBS - ]) - - PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param, - [ - AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ]) - ], [ ], [ - $ENCHANT_LIBS - ]) + else + AC_MSG_WARN([libenchant-2 not found trying with old libenchant]) + PKG_CHECK_MODULES([ENCHANT], [enchant >= 1.4.2]) + + PHP_EVAL_INCLINE($ENCHANT_CFLAGS) + PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) + + PHP_CHECK_LIBRARY(enchant, enchant_get_version, + [ + AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ enchant_get_version since 1.6.0 ]) + ], [ ], [ + $ENCHANT_LIBS + ]) + + PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param, + [ + AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ enchant_broker_set_param since 1.5.0 and removed in 2.x ]) + ], [ ], [ + $ENCHANT_LIBS + ]) + fi + + AC_DEFINE(HAVE_ENCHANT, 1, [ ]) PHP_NEW_EXTENSION(enchant, enchant.c, $ext_shared) PHP_SUBST(ENCHANT_SHARED_LIBADD)