cvs: php4 / NEWS /ext/mysql config.m4

sniper Mon Jun 10 20:18:35 2002 EDT Modified files: /php4 NEWS /php4/ext/mysql config.m4 Log: - Reverted last bogus commit and fixed the credits in NEWS. # STIG! Do a 'cvs update' before you commit anything!! Index: php4/NEWS diff -u php4/NEWS:1.1007 php4/NEWS:1.1008 --- php4/NEWS:1.1007 Sun Jun 9 22:28:31 2002 +++ php4/NEWS Mon Jun 10 20:18:32 2002 @@ -3,7 +3,7 @@ ?? ??? 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 Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.50 php4/ext/mysql/config.m4:1.51 --- php4/ext/mysql/config.m4:1.50 Mon Jun 10 17:35:26 2002 +++ php4/ext/mysql/config.m4 Mon Jun 10 20:18:34 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.50 2002/06/10 21:35:26 ssb Exp $ +dnl $Id: config.m4,v 1.51 2002/06/11 00:18:34 sniper Exp $ dnl sinclude(ext/mysql/libmysql/acinclude.m4) @@ -17,35 +17,31 @@ 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. @@ -62,21 +58,6 @@ AC_MSG_RESULT([$MYSQL_SOCK]) else PHP_MYSQL_SOCKET_SEARCH - 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