diff options
| author | Johannes Schlüter <johannes@php.net> | 2010-08-05 13:29:44 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2010-08-05 13:29:44 +0000 |
| commit | eaad585a2e9d985049296dec8b317a02149d5f6c (patch) | |
| tree | 14c32b8812ba92ccea00900c9c960f95250c4dea /ext/pdo_mysql/config.m4 | |
| parent | 3cf5ab9e567e302125f242aaff2f1bd41e3d5409 (diff) | |
| download | php-git-eaad585a2e9d985049296dec8b317a02149d5f6c.tar.gz | |
- Drop (broken) support for libmysql 3.23 and 4.0 from pdo_mysql, see bug #51259
Diffstat (limited to 'ext/pdo_mysql/config.m4')
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index d4c3745327..7b6db8cdb1 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -100,15 +100,15 @@ if test "$PHP_PDO_MYSQL" != "no"; then AC_MSG_ERROR([Unable to find your mysql installation]) fi - PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, + PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [ PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE) PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD) ],[ if test "$PHP_ZLIB_DIR" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, PDO_MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, [], [ - AC_MSG_ERROR([PDO_MYSQL configure failed. Please check config.log for more information.]) + PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [ + AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.]) ], [ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR ]) @@ -128,11 +128,6 @@ if test "$PHP_PDO_MYSQL" != "no"; then ],[ $PDO_MYSQL_LIBS ]) - - _SAVE_LIBS=$LIBS - LIBS="$LIBS $PDO_MYSQL_LIBS" - AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate]) - LIBS=$_SAVE_LIBS fi ifdef([PHP_CHECK_PDO_INCLUDES], |