This commit was manufactured by cvs2git to create branch 'RA-branch'.

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

diff --git a/php-mysql-socket.patch b/php-mysql-socket.patch
index 7436ca0ef9751d5b7b728a7bdaa747af3c9c7743..7b1e511434703edd28c64c60b9e23a3b5825ee9e 100644 (file)
--- a/php-mysql-socket.patch
+++ b/php-mysql-socket.patch
@@ -1,38 +1,25 @@
---- 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)
- 
+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 \
--      ; 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
-+      ],)
++  [  --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
+   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)