From fc7bb77cd58104cacc23f3bad139bcfd08749dde Mon Sep 17 00:00:00 2001 From: foobar Date: Wed, 20 Mar 2002 01:58:34 +0000 Subject: [PATCH] - Fixed bug: #14147 (partial MFH, the uncompress issue) --- ext/mysql/config.m4 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 215447b1ef..22f01784d6 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -83,10 +83,28 @@ elif test "$PHP_MYSQL" != "no"; then AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR) fi - if test "$PHP_ZLIB_DIR" != "no"; then - PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -z" - fi + PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ], + [ + if test "$PHP_ZLIB_DIR" != "no"; then + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQL_SHARED_LIBADD) + PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ + AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) + ], [ + -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR + ]) + MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -z" + else + PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) + PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ + AC_MSG_ERROR([Try adding --with-zlib-dir=. Please check config.log for more information.]) + ], [ + -L$MYSQL_LIB_DIR + ]) + MYSQL_LIBS="-z" + fi + ], [ + -L$MYSQL_LIB_DIR + ]) PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS" -- 2.40.0