jani                                     Sun, 29 Nov 2009 18:08:38 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291448

Log:
- Revert bad patch

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysql/config.m4

Modified: php/php-src/branches/PHP_5_3/ext/mysql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/config.m4    2009-11-29 17:59:29 UTC 
(rev 291447)
+++ php/php-src/branches/PHP_5_3/ext/mysql/config.m4    2009-11-29 18:08:38 UTC 
(rev 291448)
@@ -53,24 +53,23 @@
   [  --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=


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to