summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaromír Doleček <jdolecek@NetBSD.org>2017-12-17 12:46:28 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-12-17 12:47:35 +0100
commit200bf9b5d76b4ff2b17981000293213ca14d094b (patch)
treefa2b5f264d02e41cb54b0fa5dbe5c29e027ffa5f
parenta3b5b93ba9228c140c82828d7ea2204eb494adf4 (diff)
downloadphp-git-200bf9b5d76b4ff2b17981000293213ca14d094b.tar.gz
Fix bug #75615
Remove -I without argument in pdo_mysql config.m4.
-rw-r--r--NEWS3
-rwxr-xr-xext/pdo_mysql/config.m42
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2a8a39362b..b054c19a6f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ PHP NEWS
(Nikita, Laruence)
. Fixed bug #75698 (Using @ crashes php7.2-fpm). (Nikita)
+- PDO MySQL:
+ . Fixed bug #75615 (PDO Mysql module can't be built as module). (jdolecek)
+
- PGSQL:
. Fixed bug #75671 (pg_version() crashes when called on a connection to
cockroach). (magicaltux at gmail dot com)
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index c165fb6b51..f787cdf7fd 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -156,7 +156,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
fi
dnl fix after renaming to pdo_mysql
- PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -I -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)