From 56c24c33096bd5ce801c3be3d329d0a7738ce1f5 Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 29 May 2001 11:59:33 +0000 Subject: [PATCH] This should finally get rid of those zlib problems. And this is safe too. --- ext/mysql/config.m4 | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index bf72fbad90..2e4cf29d91 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -78,19 +78,17 @@ elif test "$PHP_MYSQL" != "no"; then AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR) fi - dnl Check if mysql_config is found. If yes, use the LIBS provided by it.. - if test -x "$MYSQL_DIR/bin/mysql_config"; then - MYSQL_LIBS=`$MYSQL_DIR/bin/mysql_config --libs | sed -e "s/-lnsl//g;s/'//g"` - MYSQL_INCLUDE=`$MYSQL_DIR/bin/mysql_config --cflags | sed -e "s/'//g"` - AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "`$MYSQL_DIR/bin/mysql_config --socket`", [Default mysql unix socket]) - else - MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient" - MYSQL_INCLUDE=-I$MYSQL_INC_DIR - PHP_MYSQL_SOCK + if test "$PHP_ZLIB_DIR" != "no"; then + PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) + MYSQL_LIBS="-L$PHP_ZLIB_DIR -z" fi - PHP_EVAL_LIBLINE($MYSQL_LIBS, MYSQL_SHARED_LIBADD) - PHP_EVAL_INCLINE($MYSQL_INCLUDE) + PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS" + + PHP_ADD_INCLUDE($MYSQL_INC_DIR) + MYSQL_INCLUDE="-I$MYSQL_INC_DIR" + PHP_MYSQL_SOCK else MYSQL_MODULE_TYPE=none -- 2.50.1