diff options
| author | foobar <sniper@php.net> | 2001-05-02 00:21:25 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-05-02 00:21:25 +0000 |
| commit | d4e64925d5fced60d6f19580e1ffaac153888cba (patch) | |
| tree | 832b4304d6f60e36571f8c2fef7c208de4a694a8 | |
| parent | f34bad2d4fae2958e30a1e4d8fb4f4be29755643 (diff) | |
| download | php-git-d4e64925d5fced60d6f19580e1ffaac153888cba.tar.gz | |
Possible Fix for #10570, #10585, #10539 and maybe others.
| -rw-r--r-- | ext/mysql/config.m4 | 19 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 3 |
2 files changed, 17 insertions, 5 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 587ecba2ef..0131258aee 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -69,6 +69,7 @@ elif test "$PHP_MYSQL" != "no"; then fi MYSQL_MODULE_TYPE="external" + for i in lib lib/mysql; do MYSQL_LIB_CHK($i) done @@ -77,15 +78,25 @@ elif test "$PHP_MYSQL" != "no"; then AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR) fi - PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) - dnl Check if mysql_config is found. If yes, use the LIBS provided by it.. if test -x "$MYSQL_DIR/bin/mysql_config"; then - PHP_EVAL_LIBLINE($MYSQL_DIR/bin/mysql_config --libs) + MYSQL_LIBS=`$echo $MYSQL_DIR/bin/mysql_config --libs | sed -e "s/'//g"` + MYSQL_INCLUDE=`$echo $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 fi - PHP_ADD_INCLUDE($MYSQL_INC_DIR) + PHP_EVAL_LIBLINE($MYSQL_LIBS, MYSQL_SHARED_LIBADD) + PHP_EVAL_INCLINE($MYSQL_INCLUDE) + else MYSQL_MODULE_TYPE="none" fi + PHP_SUBST(MYSQL_SHARED_LIBADD) +PHP_SUBST_OLD(MYSQL_MODULE_TYPE) +PHP_SUBST_OLD(MYSQL_LIBS) +PHP_SUBST_OLD(MYSQL_INCLUDE) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 06802ce6c8..a22c40b91b 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -337,8 +337,9 @@ PHP_MINFO_FUNCTION(mysql) php_info_print_table_row(2, "Active Links", buf); php_info_print_table_row(2, "Client API version", mysql_get_client_info()); #ifndef PHP_WIN32 + php_info_print_table_row(2, "MYSQL_MODULE_TYPE", PHP_MYSQL_TYPE); + php_info_print_table_row(2, "MYSQL_SOCKET", MYSQL_UNIX_ADDR); php_info_print_table_row(2, "MYSQL_INCLUDE", PHP_MYSQL_INCLUDE); - php_info_print_table_row(2, "MYSQL_LFLAGS", PHP_MYSQL_LFLAGS); php_info_print_table_row(2, "MYSQL_LIBS", PHP_MYSQL_LIBS); #endif php_info_print_table_end(); |