[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mysql config.m4

[Anantha Kesari H Y]

hyanantha               Tue Jul 26 10:02:02 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/mysql  config.m4 
  Log:
  NetWare libmysqlclient library is available as libmysql(olden times 8.3 
limitation). 
  Applying the accepted patches on 5.0 tree.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.54.2.3&r2=1.54.2.3.2.1&ty=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.54.2.3 
php-src/ext/mysql/config.m4:1.54.2.3.2.1
--- php-src/ext/mysql/config.m4:1.54.2.3        Thu Dec 30 02:02:17 2004
+++ php-src/ext/mysql/config.m4 Tue Jul 26 10:02:00 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.54.2.3 2004/12/30 07:02:17 sniper Exp $
+dnl $Id: config.m4,v 1.54.2.3.2.1 2005/07/26 14:02:00 hyanantha Exp $
 dnl
 
 sinclude(ext/mysql/libmysql/acinclude.m4)
@@ -8,7 +8,7 @@
 sinclude(libmysql/mysql.m4)
 
 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
@@ -114,19 +114,26 @@
 
   MYSQL_MODULE_TYPE=external
 
+  MY_LIBNAME=mysqlclient
+  case $host_alias in
+    *netware*[)]
+      MY_LIBNAME=mysql
+      ;;
+  esac
+
   for i in lib lib/mysql; do
     MYSQL_LIB_CHK($i)
   done
 
   if test -z "$MYSQL_LIB_DIR"; then
-    AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR)
+    AC_MSG_ERROR(Cannot find lib$MY_LIBNAME library under $MYSQL_DIR)
   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 
@@ -134,7 +141,7 @@
       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
@@ -145,8 +152,8 @@
     -L$MYSQL_LIB_DIR 
   ])
 
-  PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
-  MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS"
+  PHP_ADD_LIBRARY_WITH_PATH($MY_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
+  MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS"
 
   PHP_ADD_INCLUDE($MYSQL_INC_DIR)
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php