Skip to content

Commit 7a6d737

Browse files
committed
Remove PHP_MYSQL variable
PHP_MYSQL variable was once defined by the ext/mysql (--with-mysql). Closes GH-4399
1 parent f573ba1 commit 7a6d737

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,12 +1436,6 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
14361436
CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
14371437
fi
14381438

1439-
dnl This will go away, if we have a facility to run per-extension code after the
1440-
dnl thread_safety decision was done.
1441-
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
1442-
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
1443-
fi
1444-
14451439
if test "$PHP_WERROR" = "yes"; then
14461440
CFLAGS="$CFLAGS -Werror"
14471441
CPPFLAGS="$CPPFLAGS -Werror"

ext/pdo_mysql/config.m4

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,14 @@ if test "$PHP_PDO_MYSQL" != "no"; then
131131
AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
132132
fi
133133

134-
dnl fix after renaming to pdo_mysql
135134
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)
136-
ifdef([PHP_ADD_EXTENSION_DEP],
137-
[
138-
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
139-
if test "$PHP_MYSQL" = "mysqlnd"; then
140-
PHP_ADD_EXTENSION_DEP(pdo_mysql, mysqlnd)
141-
fi
142-
])
135+
136+
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
137+
138+
if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
139+
PHP_ADD_EXTENSION_DEP(pdo_mysql, mysqlnd)
140+
fi
141+
143142
PDO_MYSQL_MODULE_TYPE=external
144143

145144
PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)

0 commit comments

Comments
 (0)