com php-src: Like Shady, --with-mysql-sock is back.: ext/mysqli/config.m4 ext/pdo_mysql/config.m4
| From: | Adam Harvey | Date: | Thu, 05 Mar 2015 19:00:02 +0000 |
| Subject: | com php-src: Like Shady, --with-mysql-sock is back.: ext/mysqli/config.m4 ext/pdo_mysql/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85268@lists.php.net to get a copy of this message | ||
Commit: 7fa10095603ae03f0028041620ffe80375a1c84c
Author: Adam Harvey <aharvey@php.net> Thu, 5 Mar 2015 18:58:54 +0000
Parents: bb103e53ed95c57bfa14368a48cc745730037bce
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7fa10095603ae03f0028041620ffe80375a1c84c
Log:
Like Shady, --with-mysql-sock is back.
As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
Changed paths:
M ext/mysqli/config.m4
M ext/pdo_mysql/config.m4
Diff:
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index dedd1bc..c700dac 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -2,6 +2,33 @@ dnl
dnl $Id$
dnl config.m4 for extension mysqli
+dnl ext/pdo_mysql/config.m4 also depends on this macro.
+AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
+ for i in \
+ /var/run/mysqld/mysqld.sock \
+ /var/tmp/mysql.sock \
+ /var/run/mysql/mysql.sock \
+ /var/lib/mysql/mysql.sock \
+ /var/mysql/mysql.sock \
+ /usr/local/mysql/var/mysql.sock \
+ /Private/tmp/mysql.sock \
+ /private/tmp/mysql.sock \
+ /tmp/mysql.sock \
+ ; do
+ if test -r $i; then
+ MYSQL_SOCK=$i
+ break 2
+ fi
+ done
+
+ if test -n "$MYSQL_SOCK"; then
+ AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
+ AC_MSG_RESULT([$MYSQL_SOCK])
+ else
+ AC_MSG_RESULT([no])
+ fi
+])
+
PHP_ARG_WITH(mysqli, for MySQLi support,
[ --with-mysqli[=FILE] Include MySQLi support. FILE is the path
to mysql_config. If no value or mysqlnd is passed
@@ -12,6 +39,12 @@ PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
MYSQLi: Enable embedded support
Note: Does not work with MySQL native driver!], no, no)
+dnl ext/pdo_mysql/config.m4 also depends on this configure option.
+PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
+[ --with-mysql-sock[=SOCKPATH]
+ MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
+ If unspecified, the default locations are searched], no, no)
+
if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" =
"mysqlnd"; then
dnl This needs to be set in any extension which wishes to use mysqlnd
PHP_MYSQLND_ENABLED=yes
@@ -72,6 +105,17 @@ fi
dnl Build extension
if test "$PHP_MYSQLI" != "no"; then
+ AC_MSG_CHECKING([for MySQL UNIX socket location])
+ if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK"
!= "yes"; then
+ MYSQL_SOCK=$PHP_MYSQL_SOCK
+ AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
+ AC_MSG_RESULT([$MYSQL_SOCK])
+ elif test "$PHP_MYSQL_SOCK" = "yes"; then
+ PHP_MYSQL_SOCKET_SEARCH
+ else
+ AC_MSG_RESULT([no])
+ fi
+
mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources"
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config..m4
index 4b79a8b..c165fb6 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -13,6 +13,18 @@ if test -z "$PHP_ZLIB_DIR"; then
fi
if test "$PHP_PDO_MYSQL" != "no"; then
+ dnl This depends on ext/mysqli/config.m4 providing the
+ dnl PHP_MYSQL_SOCKET_SEARCH macro and --with-mysql-sock configure option.
+ AC_MSG_CHECKING([for MySQL UNIX socket location])
+ if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK"
!= "yes"; then
+ MYSQL_SOCK=$PHP_MYSQL_SOCK
+ AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
+ AC_MSG_RESULT([$MYSQL_SOCK])
+ elif test "$PHP_MYSQL_SOCK" = "yes"; then
+ PHP_MYSQL_SOCKET_SEARCH
+ else
+ AC_MSG_RESULT([no])
+ fi
if test "$PHP_PDO" = "no" && test "$ext_shared" =
"no"; then
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])