diff options
| author | foobar <sniper@php.net> | 2005-06-11 23:32:46 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-06-11 23:32:46 +0000 |
| commit | 7a794caed04f142844d88a6e69b27d9242be32bb (patch) | |
| tree | 5bb2ea58b59cbeb003122816ca0b2698f3bb19f7 /ext/mysql/config.m4 | |
| parent | dddac3e86e5692702219a0c2f9c5537336a8ef80 (diff) | |
| download | php-git-7a794caed04f142844d88a6e69b27d9242be32bb.tar.gz | |
Another netware fix
Diffstat (limited to 'ext/mysql/config.m4')
| -rw-r--r-- | ext/mysql/config.m4 | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 352729d821..e63f9067fd 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -3,7 +3,7 @@ dnl $Id$ 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 @@ -86,20 +86,27 @@ if test "$PHP_MYSQL" != "no"; then Note that the MySQL client library is not bundled anymore!]) fi + MY_LIBNAME=mysqlclient + case $host_alias in + *netware*[)] + MY_LIBNAME=mysql + ;; + esac + for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do MYSQL_LIB_CHK($i) done if test -z "$MYSQL_LIB_DIR"; then - AC_MSG_ERROR([Cannot find libmysqlclient under $MYSQL_DIR. + AC_MSG_ERROR([Cannot find lib$MY_LIBNAME under $MYSQL_DIR. 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/$PHP_LIBDIR -L$MYSQL_LIB_DIR @@ -107,7 +114,7 @@ Note that the MySQL client library is not bundled anymore!]) MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -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 @@ -124,7 +131,7 @@ Note that the MySQL client library is not bundled anymore!]) 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) |