- Reverted last bogus commit and fixed the credits in NEWS.

# STIG! Do a 'cvs update' before you commit anything!!

2 files changed, 16 insertions, 35 deletions

diff --git a/NEWS b/NEWS
index c54bcd3735..2e33a7c3a0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? 2002, Version 4.3.0
 - Fixed shuffle() to provide equal distribution of values. (Andrei)
 - Added --with-mysql-sock configure option which can be used to override
-  the unix socket location. (e.g. NFS compiles, etc.) (imajes)
+  the unix socket location. (e.g. NFS compiles, etc.) (James Cox)
 - Fixed is_a() to properly work on extension registered classes. (Andrei)
 - Added new constants: PHP_PREFIX and PHP_SHLIB_SUFFIX. (Stig)
 - Added STDIN, STDOUT and STDERR constants for CLI sapi reflecting opened
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 329a58c942..9b9d5430d6 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -17,35 +17,31 @@ AC_DEFUN(MYSQL_LIB_CHK, [
   done
 ])
 
-AC_DEFUN(PHP_AC_MYSQL_SOCK,[
-  AC_MSG_CHECKING(for default MySQL UNIX socket)
-    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 \
-      /tmp/mysql.sock \
-      ; do
+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 \
+    /tmp/mysql.sock \
+  ; do
     if test -r $i; then
       MYSQL_SOCK=$i
-      break
+      break 2
     fi
   done
-  if test "$MYSQL_SOCK" = ""; then
-    MYSQL_SOCK=/var/lib/mysql/mysql.sock	
-  fi
-
+  
   AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
   AC_MSG_RESULT([$MYSQL_SOCK])
 ])
 
 
 PHP_ARG_WITH(mysql, for MySQL support,
-[  --with-mysql[=DIR]      Include MySQL support. DIR is the MySQL base dir.
-                          If unspecified, the bundled MySQL library is used.], yes)
+[  --with-mysql[=DIR]      Include MySQL support. DIR is the MySQL base directory.
+                          If unspecified, the bundled MySQL library will be used.], yes)
 
 PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
 [  --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer.
@@ -65,21 +61,6 @@ if test "$PHP_MYSQL" != "no"; then
   fi
 fi
 
-if test "$PHP_MYSQL" != "no"; then
-  PHP_ARG_WITH(mysql-sock, location of the MySQL socket,
-  [  --with-mysql-sock[=PATH] Optionally reference the name of the MySQL Socket.
-                          If unspecified, it will search default locations.], no)
-  
-  if test "$PHP_MYSQL_SOCK" != "no"; then
-    MYSQL_SOCK=$PHP_MYSQL_SOCK
-    AC_MSG_CHECKING(for specified MySQL UNIX socket)
-    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
-    AC_MSG_RESULT($MYSQL_SOCK)
-  else
-    PHP_AC_MYSQL_SOCK
-  fi
-fi
-
 if test "$PHP_MYSQL" = "yes"; then
   MYSQL_MODULE_TYPE=builtin
   MYSQL_CHECKS