cvs: php-src(PHP_5_3) / NEWS /ext/recode config9.m4

johannes Mon Dec 1 23:30:22 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/recode config9.m4 Log: MFH: hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql with recent libmysql versions [DOC] http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.396&r2=1.2027.2.547.2.965.2.397&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.396 php-src/NEWS:1.2027.2.547.2.965.2.397 --- php-src/NEWS:1.2027.2.547.2.965.2.396 Mon Dec 1 09:49:57 2008 +++ php-src/NEWS Mon Dec 1 23:30:21 2008 @@ -35,6 +35,8 @@ - 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) http://cvs.php.net/viewvc.cgi/php-src/ext/recode/config9.m4?r1=1.2&r2=1.2.6.1&diff_format=u Index: php-src/ext/recode/config9.m4 diff -u php-src/ext/recode/config9.m4:1.2 php-src/ext/recode/config9.m4:1.2.6.1 --- php-src/ext/recode/config9.m4:1.2 Tue Nov 9 16:11:13 2004 +++ php-src/ext/recode/config9.m4 Mon Dec 1 23:30:21 2008 @@ -1,11 +1,16 @@ dnl -dnl $Id: config9.m4,v 1.2 2004/11/09 16:11:13 jorton Exp $ +dnl $Id: config9.m4,v 1.2.6.1 2008/12/01 23:30:21 johannes Exp $ 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])