This should finally get rid of those zlib problems. And this is safe too.

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index bf72fbad9067efb8dbdacae82fd580768101fffa..2e4cf29d91bcd6693036d1bcc400848baaf43bb0 100644 (file)
--- 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