diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/recode/config9.m4 | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -35,6 +35,8 @@ PHP NEWS - Fixed invalid calls to free when internal fileinfo magic file is used. (Scott) - Fixed memory leak inside wddx_add_vars() function. (Felipe) - Synced changes from libmagic 4.26 to bundled libmagic. (Scott) +- Fixed check in recode extension to allow builing of recode and mysql + extensions when using a recent libmysql. (Johannes) - Fixed bug #46711 (cURL curl_setopt leaks memory in foreach loops). (magicaltux [at] php [dot] net) diff --git a/ext/recode/config9.m4 b/ext/recode/config9.m4 index 2065f6c6e9..66df50e221 100644 --- a/ext/recode/config9.m4 +++ b/ext/recode/config9.m4 @@ -5,7 +5,12 @@ dnl dnl Check for extensions with which Recode can not work if test "$PHP_RECODE" != "no"; then test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" - test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql" + + if test -n "$MYSQL_LIBNAME"; then + PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [ + recode_conflict="$recode_conflict mysql" + ]) + fi if test -n "$recode_conflict"; then AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) |