From: Johannes Schlüter <johannes@php.net>
Date: Mon, 1 Dec 2008 23:30:21 +0000 (+0000)
Subject: MFH: hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql
X-Git-Tag: php-5.3.0alpha2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b24c89a9df3a1534ad75232942f0fe81c1f8b91;p=php

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 9d928322a8..29448eedfc 100644
--- 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 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])