cvs: php4 /ext/mysql/ config.m4

sas Sat Jun 10 00:38:58 2000 EDT Modified files: /php4/ext/mysql config.m4 Log: Search for mysqlclient library in lib and lib/mysql Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.23 php4/ext/mysql/config.m4:1.24 --- php4/ext/mysql/config.m4:1.23 Tue May 2 14:18:58 2000 +++ php4/ext/mysql/config.m4 Sat Jun 10 00:38:58 2000 @@ -1,10 +1,20 @@ -dnl $Id: config.m4,v 1.23 2000/05/02 21:18:58 sas Exp $ +dnl $Id: config.m4,v 1.24 2000/06/10 07:38:58 sas Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) sinclude(libmysql/acinclude.m4) sinclude(libmysql/mysql.m4) +AC_DEFUN(MYSQL_LIB_CHK,[ + str="$MYSQL_DIR/$1/libmysqlclient.*" + for i in echo $str; do + if test -r $i; then + MYSQL_LIB_DIR="$MYSQL_DIR/$1" + break 2 + fi + done +]) + AC_DEFUN(PHP_MYSQL_SOCK,[ AC_MSG_CHECKING(for MySQL UNIX socket) MYSQL_SOCK=/tmp/mysql.sock @@ -55,8 +65,16 @@ if test -z "$MYSQL_DIR"; then AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL) fi + + 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) + fi - AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_DIR/lib/mysql, MYSQL_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) AC_ADD_INCLUDE($MYSQL_INC_DIR) fi