From 8d169e42de8e53e263ff42c10b18d266d9e5dcc4 Mon Sep 17 00:00:00 2001
From: Gwynne Raskind <gwynne@php.net>
Date: Sat, 28 Nov 2009 21:11:39 +0000
Subject: [PATCH] socket location needs to be checked before mysqlnd in order
 for --with-mysql-sock to work with mysqlnd

---
 ext/mysql/config.m4 | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 8de15e8bbb..e7e73408a2 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -53,23 +53,24 @@ if test -z "$PHP_ZLIB_DIR"; then
   [  --with-zlib-dir[=DIR]     MySQL: Set the path to libz install prefix], no, no)
 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
+
+ 
 if test "$PHP_MYSQL" = "mysqlnd"; then
   dnl enables build of mysqnd library
   PHP_MYSQLND_ENABLED=yes
 
 elif 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
-
   MYSQL_DIR=
   MYSQL_INC_DIR=
 
-- 
2.50.1