Patch patch-configure-mysql-sock for *Compile Issues Bug #68533
Patch version 2015-12-09 17:14 UTC
Return to Bug #68533 |
Download this patch
Patch Revisions:
Developer: nvizovitin@odin.com
diff -r 3acbafa6791b ext/mysql/config.m4
--- ./ext/mysql/config.m4 Wed Dec 09 17:44:09 2015 +0600
+++ ./ext/mysql/config.m4 Wed Dec 09 17:53:29 2015 +0600
@@ -144,19 +144,19 @@
PHP_SUBST_OLD(MYSQL_INCLUDE)
fi
+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" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
+ PHP_MYSQL_SOCKET_SEARCH
+else
+ AC_MSG_RESULT([no])
+fi
+
dnl Enable extension
if test "$PHP_MYSQL" != "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" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
- PHP_MYSQL_SOCKET_SEARCH
- else
- AC_MSG_RESULT([no])
- fi
-
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
PHP_SUBST(MYSQL_SHARED_LIBADD)
|