From 6b270a0bdd77bc473e23d2a281676655639bc836 Mon Sep 17 00:00:00 2001
From: Anantha Kesari H Y <hyanantha@php.net>
Date: Tue, 26 Jul 2005 14:02:00 +0000
Subject: [PATCH] NetWare libmysqlclient library is available as libmysql(olden
 times 8.3 limitation). Applying the accepted patches on 5.0 tree. --Kamesh

---
 ext/mysql/config.m4 | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index cf8a82b971..d1293f2cde 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -8,7 +8,7 @@ sinclude(libmysql/acinclude.m4)
 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 @@ elif test "$PHP_MYSQL" != "no"; then
 
   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 @@ elif test "$PHP_MYSQL" != "no"; then
       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 @@ elif test "$PHP_MYSQL" != "no"; then
     -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
-- 
2.40.0