projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 5316c927 AF |
1 | --- php-4.0RC1/ext/mysql/config.m4.wiget Sun Mar 26 21:51:10 2000 |
| 2 | +++ php-4.0RC1/ext/mysql/config.m4 Fri Mar 31 12:23:06 2000 | |
| 3 | @@ -4,17 +4,25 @@ | |
| 4 | sinclude(ext/mysql/libmysql/mysql.m4) | |
| 5 | ||
| 6 | AC_DEFUN(PHP_MYSQL_SOCK,[ | |
| 7 | - AC_MSG_CHECKING(for MySQL UNIX socket) | |
| 8 | - MYSQL_SOCK=/tmp/mysql.sock | |
| 9 | - for i in \ | |
| 10 | - /var/run/mysqld/mysqld.sock \ | |
| 11 | - /var/tmp/mysql.sock \ | |
| 12 | - /var/lib/mysql/mysql.sock \ | |
| 13 | - ; do | |
| 14 | - if test -r $i; then | |
| 15 | - MYSQL_SOCK=$i | |
| 16 | - fi | |
| 17 | - done | |
| 18 | + AC_ARG_WITH(mysql_sock, | |
| 19 | +[ --with-mysql-socket=PATH | |
| 20 | + Specify location of MySQL UNIX socket, | |
| 21 | + defaults search in know locations],[ | |
| 22 | + MYSQL_SOCK=$withval | |
| 23 | + ],) | |
| 24 | + if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then | |
| 25 | + AC_MSG_CHECKING(for MySQL UNIX socket) | |
| 26 | + MYSQL_SOCK=/tmp/mysql.sock | |
| 27 | + for i in \ | |
| 28 | + /var/run/mysqld/mysqld.sock \ | |
| 29 | + /var/tmp/mysql.sock \ | |
| 30 | + /var/lib/mysql/mysql.sock \ | |
| 31 | + ; do | |
| 32 | + if test -r $i; then | |
| 33 | + MYSQL_SOCK=$i | |
| 34 | + fi | |
| 35 | + done | |
| 36 | + fi | |
| 37 | AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ]) | |
| 38 | AC_MSG_RESULT($MYSQL_SOCK) | |
| 39 | ]) |