diff options
| -rw-r--r-- | ext/mysql/config.m4 | 17 | ||||
| -rw-r--r-- | ext/mysql/libmysql/mysql_com.h | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index b64f32f422..bfa07305a2 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -4,6 +4,22 @@ 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 @@ if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) AC_ADD_INCLUDE(${ext_src_base}libmysql) MYSQL_CHECKS + PHP_MYSQL_SOCK fi diff --git a/ext/mysql/libmysql/mysql_com.h b/ext/mysql/libmysql/mysql_com.h index 2a280db4f6..c4c0ecfdd7 100644 --- a/ext/mysql/libmysql/mysql_com.h +++ b/ext/mysql/libmysql/mysql_com.h @@ -20,7 +20,6 @@ extern "C" { #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" |