cvs: /php4/ext/mysql config.m4 /php4/ext/mysql/libmysql mysql_com.h

sas Tue Mar 7 08:56:48 2000 EDT Modified files: /php4/ext/mysql config.m4 /php4/ext/mysql/libmysql mysql_com.h Log: Try to locate the mysql.sock Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.16 php4/ext/mysql/config.m4:1.17 --- php4/ext/mysql/config.m4:1.16 Tue Mar 7 08:33:30 2000 +++ php4/ext/mysql/config.m4 Tue Mar 7 08:56:17 2000 @@ -1,9 +1,25 @@ -dnl $Id: config.m4,v 1.16 2000/03/07 16:33:30 andi Exp $ +dnl $Id: config.m4,v 1.17 2000/03/07 16:56:17 sas Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) AC_ARG_WITH(mysql,[],[enable_mysql=$withval]) + +AC_DEFUN(PHP_MYSQL_SOCK,[ + AC_MSG_CHECKING(for MySQL UNIX socket) + MYSQL_SOCK=/tmp/mysql.sock + for i in \ + /var/run/mysqld/mysqld.sock \ + /var/tmp/mysql.sock \ + /var/lib/mysql/mysql.sock \ + ; do + if test -r $i; then + MYSQL_SOCK=$i + fi + done + AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ]) + AC_MSG_RESULT($MYSQL_SOCK) +]) AC_MSG_CHECKING(for MySQL support) AC_ARG_ENABLE(mysql, @@ -19,4 +35,5 @@ AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) AC_ADD_INCLUDE(${ext_src_base}libmysql) MYSQL_CHECKS + PHP_MYSQL_SOCK fi Index: php4/ext/mysql/libmysql/mysql_com.h diff -u php4/ext/mysql/libmysql/mysql_com.h:1.2 php4/ext/mysql/libmysql/mysql_com.h:1.3 --- php4/ext/mysql/libmysql/mysql_com.h:1.2 Mon Mar 6 15:12:56 2000 +++ php4/ext/mysql/libmysql/mysql_com.h Tue Mar 7 08:56:17 2000 @@ -20,7 +20,6 @@ #define LOCAL_HOST_NAMEDPIPE "." #define MYSQL_PORT 3306 /* Alloced by ISI for MySQL */ -#define MYSQL_UNIX_ADDR "/tmp/mysql.sock" #if defined(__EMX__) || defined(__OS2__) #undef MYSQL_UNIX_ADDR #define MYSQL_OS2_ADDR "\\socket\\MySQL"