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

- hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql
  with recent libmysql versions [DOC]
---

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])