- release 11.

[packages/php.git] / php-mysql-socket.patch

diff --git a/php-mysql-socket.patch b/php-mysql-socket.patch
index de6e3dd13d21e1184f6e5fb651c62b177e7b3119..7b1e511434703edd28c64c60b9e23a3b5825ee9e 100644 (file)
--- a/php-mysql-socket.patch
+++ b/php-mysql-socket.patch
@@ -1,40 +1,26 @@
---- 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 @@
+diff -urN php-4.2.1RC2.org/ext/mysql/config.m4 php-4.2.1RC2/ext/mysql/config.m4
+--- php-4.2.1RC2.org/ext/mysql/config.m4       Sat May 11 20:49:23 2002
++++ php-4.2.1RC2/ext/mysql/config.m4   Sat May 11 20:55:42 2002
+@@ -18,6 +18,14 @@
  ])
        
  AC_DEFUN(PHP_MYSQL_SOCK,[
--  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 \
--      /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  \
+@@ -32,6 +40,7 @@
+       MYSQL_SOCK=$i
+     fi
+   done
++  fi
    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
    AC_MSG_RESULT($MYSQL_SOCK)
  ])