summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2008-11-06 11:12:21 +0000
committerJohannes Schlüter <johannes@php.net>2008-11-06 11:12:21 +0000
commitef3ce03e5e29b9b67605ffb2cb8c2e74398494cb (patch)
tree44929a304810299498159101000bd496e76be485
parent9186528994f586a83523837b3e64fb2139728bad (diff)
downloadphp-git-ef3ce03e5e29b9b67605ffb2cb8c2e74398494cb.tar.gz
MFH: Don't enable mysqlnd when pdo_mysql is being built with libmysql
-rwxr-xr-xext/pdo_mysql/config.m44
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 931cddc0cb..28094d3363 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -18,8 +18,6 @@ if test "$PHP_PDO_MYSQL" != "no"; then
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
fi
- PHP_MYSQLND_ENABLED=yes
-
AC_DEFUN([PDO_MYSQL_LIB_CHK], [
str="$PDO_MYSQL_DIR/$1/libmysqlclient*"
for j in `echo $str`; do
@@ -32,7 +30,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
dnl enables build of mysqnd library
- PHP_MYSQL_ENABLED=yes
+ PHP_MYSQLND_ENABLED=yes
AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
else
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])