cvs: php4 /ext/mysql config.m4 php_mysql.c

sniper Tue May 1 17:21:25 2001 EDT Modified files: /php4/ext/mysql config.m4 php_mysql.c Log: Possible Fix for #10570, #10585, #10539 and maybe others. Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.29 php4/ext/mysql/config.m4:1.30 --- php4/ext/mysql/config.m4:1.29 Tue Mar 27 12:34:37 2001 +++ php4/ext/mysql/config.m4 Tue May 1 17:21:25 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.29 2001/03/27 20:34:37 sniper Exp $ +dnl $Id: config.m4,v 1.30 2001/05/02 00:21:25 sniper Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -69,6 +69,7 @@ fi MYSQL_MODULE_TYPE="external" + for i in lib lib/mysql; do MYSQL_LIB_CHK($i) done @@ -77,15 +78,25 @@ 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) Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.78 php4/ext/mysql/php_mysql.c:1.79 --- php4/ext/mysql/php_mysql.c:1.78 Sun Apr 29 04:37:03 2001 +++ php4/ext/mysql/php_mysql.c Tue May 1 17:21:25 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.78 2001/04/29 11:37:03 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.79 2001/05/02 00:21:25 sniper Exp $ */ /* TODO: @@ -337,8 +337,9 @@ 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();