MFH: hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql

     with recent libmysql versions [DOC]

diff --git a/NEWS b/NEWS
index 9d928322a8f95f84adfb9624e950befaa6042ffa..29448eedfcba3331daaab08b4b7cd65f6f615869 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 2065f6c6e905132a78160ecf233e93f576f44dc4..66df50e2214828bf2fb77fe4d89a168f3a65db84 100644 (file)
--- 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])