diff -uprb php-5.3.0.orig/ext/mysql/config.m4 php-5.3.0/ext/mysql/config.m4 --- php-5.3.0.orig/ext/mysql/config.m4 2008-07-21 15:58:51.000000000 +0300 +++ php-5.3.0/ext/mysql/config.m4 2009-11-19 15:03:53.000000000 +0200 @@ -53,11 +53,7 @@ if test -z "$PHP_ZLIB_DIR"; then [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no) fi -if test "$PHP_MYSQL" = "mysqlnd"; then - dnl enables build of mysqnd library - PHP_MYSQLND_ENABLED=yes - -elif test "$PHP_MYSQL" != "no"; then +if test "$PHP_MYSQL" != "no"; then AC_MSG_CHECKING([for MySQL UNIX socket location]) if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then @@ -70,6 +66,14 @@ elif test "$PHP_MYSQL" != "no"; then AC_MSG_RESULT([no]) fi +fi + +if test "$PHP_MYSQL" = "mysqlnd"; then + dnl enables build of mysqnd library + PHP_MYSQLND_ENABLED=yes + +elif test "$PHP_MYSQL" != "no"; then + MYSQL_DIR= MYSQL_INC_DIR=