cvs: php4(PHP_4_2_0) /ext/mysql config.m4

sniper Tue Mar 19 20:58:37 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/mysql config.m4 Log: - Fixed bug: #14147 (partial MFH, the uncompress issue) Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.38.2.1 php4/ext/mysql/config.m4:1.38.2.2 --- php4/ext/mysql/config.m4:1.38.2.1 Thu Mar 7 15:39:55 2002 +++ php4/ext/mysql/config.m4 Tue Mar 19 20:58:34 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.38.2.1 2002/03/07 20:39:55 jason Exp $ +dnl $Id: config.m4,v 1.38.2.2 2002/03/20 01:58:34 sniper Exp $ dnl sinclude(ext/mysql/libmysql/acinclude.m4) @@ -83,10 +83,28 @@ 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=<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"