updated to 4.0.4

Changed files:
    php-mysql-socket.patch -> 1.4

diff --git a/php-mysql-socket.patch b/php-mysql-socket.patch
index 7436ca0ef9751d5b7b728a7bdaa747af3c9c7743..de6e3dd13d21e1184f6e5fb651c62b177e7b3119 100644 (file)
--- a/php-mysql-socket.patch
+++ b/php-mysql-socket.patch
@@ -1,8 +1,8 @@
---- php-4.0RC1/ext/mysql/config.m4.wiget       Sun Mar 26 21:51:10 2000
-+++ php-4.0RC1/ext/mysql/config.m4     Fri Mar 31 12:23:06 2000
-@@ -4,17 +4,25 @@
- sinclude(ext/mysql/libmysql/mysql.m4)
- 
+--- php-4.0.4/ext/mysql/config.m4.wiget        Tue Nov 21 12:07:50 2000
++++ php-4.0.4/ext/mysql/config.m4      Wed Dec 20 17:12:47 2000
+@@ -16,18 +16,25 @@
+ ])
+       
  AC_DEFUN(PHP_MYSQL_SOCK,[
 -  AC_MSG_CHECKING(for MySQL UNIX socket)
 -  MYSQL_SOCK=/tmp/mysql.sock
@@ -10,30 +10,31 @@
 -      /var/run/mysqld/mysqld.sock \
 -      /var/tmp/mysql.sock \
 -      /var/lib/mysql/mysql.sock \
+-      /var/mysql/mysql.sock \
 -      ; do
 -    if test -r $i; then
 -      MYSQL_SOCK=$i
 -    fi
 -  done
-+  AC_ARG_WITH(mysql_sock,
-+[  --with-mysql-socket=PATH   
-+                              Specify location of MySQL UNIX socket,
-+                            defaults search in know locations],[
-+      MYSQL_SOCK=$withval
-+      ],)
-+  if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
-+    AC_MSG_CHECKING(for MySQL UNIX socket)
-+    MYSQL_SOCK=/tmp/mysql.sock
-+    for i in  \
-+        /var/run/mysqld/mysqld.sock \
-+        /var/tmp/mysql.sock \
-+        /var/lib/mysql/mysql.sock \
-+        ; do
-+      if test -r $i; then
-+        MYSQL_SOCK=$i
-+      fi
-+    done
-+  fi
++   AC_ARG_WITH(mysql_sock,
++ [  --with-mysql-socket=PATH  
++                               Specify location of MySQL UNIX socket,
++                            defaults search in know locations],[
++      MYSQL_SOCK=$withval
++      ],)
++   if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
++     AC_MSG_CHECKING(for MySQL UNIX socket)
++     MYSQL_SOCK=/tmp/mysql.sock
++     for i in  \
++         /var/run/mysqld/mysqld.sock \
++         /var/tmp/mysql.sock \
++         /var/lib/mysql/mysql.sock \
++         ; do
++       if test -r $i; then
++         MYSQL_SOCK=$i
++       fi
++     done
++   fi
    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
    AC_MSG_RESULT($MYSQL_SOCK)
  ])