diff options
| author | Johannes Schlüter <johannes@php.net> | 2008-12-01 23:29:42 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2008-12-01 23:29:42 +0000 |
| commit | 422f84dc2108bc582efcb80eb288d48267e9b670 (patch) | |
| tree | 000079e5a3b8540bc3527093ae5f61a2223656e4 /ext | |
| parent | b79774409e953dfe829e098232d4ebf8d1ccbd77 (diff) | |
| download | php-git-422f84dc2108bc582efcb80eb288d48267e9b670.tar.gz | |
- hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql
with recent libmysql versions [DOC]
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/recode/config9.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
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]) |