From: Johannes Schlüter <johannes@php.net>
Date: Thu, 6 Nov 2008 11:11:57 +0000 (+0000)
Subject: Don't enable mysqlnd when pdo_mysql is being built with libmysql
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f71be7e1e8ce9c2c159ab46c1f280195cb613e1;p=php

Don't enable mysqlnd when pdo_mysql is being built with libmysql
---

diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 0457ae77bd..aab8682cf3 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -19,8 +19,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
@@ -33,7 +31,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])