diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:37 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:37 -0400 |
| commit | 10f5b47dc7c1cf2b9a00991629f43652710322d3 (patch) | |
| tree | 3b727a16f652b8042d573e90f003868ffb3b56c7 /ext/mysql | |
| parent | 0e920280a2e04b110827bb766b9f29e3d581c4ee (diff) | |
| download | php-10f5b47dc7c1cf2b9a00991629f43652710322d3.tar.gz | |
Imported Upstream version 5.0.5upstream/5.0.5
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/config.m4 | 23 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 5 |
2 files changed, 19 insertions, 9 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index c79a71998..d167b5c22 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.61.2.1 2004/12/30 07:04:10 sniper Exp $ +dnl $Id: config.m4,v 1.61.2.3 2005/06/20 13:46:02 sniper Exp $ dnl AC_DEFUN([MYSQL_LIB_CHK], [ - str="$MYSQL_DIR/$1/libmysqlclient.*" + str="$MYSQL_DIR/$1/lib$MY_LIBNAME.*" for j in `echo $str`; do if test -r $j; then MYSQL_LIB_DIR=$MYSQL_DIR/$1 @@ -83,7 +83,14 @@ if test "$PHP_MYSQL" != "no"; then Note that the MySQL client library is not bundled anymore.]) fi - for i in lib lib/mysql; do + MY_LIBNAME=mysqlclient + case $host_alias in + *netware*[)] + MY_LIBNAME=mysql + ;; + esac + + for i in lib lib/mysql lib64 lib64/mysql; do MYSQL_LIB_CHK($i) done @@ -92,11 +99,11 @@ Note that the MySQL client library is not bundled anymore.]) Note that the MySQL client library is not bundled anymore.]) fi - PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ], + PHP_CHECK_LIBRARY($MY_LIBNAME, 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, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR @@ -104,7 +111,7 @@ Note that the MySQL client library is not bundled anymore.]) MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.]) ], [ -L$MYSQL_LIB_DIR @@ -115,13 +122,13 @@ Note that the MySQL client library is not bundled anymore.]) -L$MYSQL_LIB_DIR ]) - PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($MY_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) PHP_ADD_INCLUDE($MYSQL_INC_DIR) PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) MYSQL_MODULE_TYPE=external - MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS" + MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS" MYSQL_INCLUDE=-I$MYSQL_INC_DIR PHP_SUBST(MYSQL_SHARED_LIBADD) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 2b7173d4d..2fb926c1c 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.209.2.1 2005/02/22 14:59:30 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.209.2.2 2005/04/07 22:23:28 sniper Exp $ */ /* TODO: * @@ -52,6 +52,9 @@ # endif # include <netdb.h> # include <netinet/in.h> +# if HAVE_ARPA_INET_H +# include <arpa/inet.h> +# endif #endif #include <mysql.h> |