Skip to content

Commit b56f81c

Browse files
authored
Add configure phase dependencies to mysqlnd extension (#15380)
The hash extension is required in mysqlnd extension for using sha functions when extended SSL is enabled (MYSQLND_HAVE_SSL).
1 parent 6f44a0d commit b56f81c

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

ext/mysqlnd/config.w32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if (PHP_MYSQLND != "no") {
3838
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
3939
if (CHECK_LIB("crypt32.lib", "mysqlnd")) {
4040
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.");
41+
ADD_EXTENSION_DEP('mysqlnd', 'hash');
4142
}
4243
}
4344
PHP_INSTALL_HEADERS("", "ext/mysqlnd");

ext/mysqlnd/config9.m4

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
3636
AC_DEFINE([MYSQLND_SSL_SUPPORTED], [1],
3737
[Define to 1 if mysqlnd core SSL is enabled.])
3838

39-
AS_VAR_IF([PHP_MYSQLND_SSL], [no],,
40-
[PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD],
41-
[AC_DEFINE([MYSQLND_HAVE_SSL], [1],
42-
[Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.])])])
43-
4439
PHP_NEW_EXTENSION([mysqlnd], m4_normalize([
4540
mysqlnd_alloc.c
4641
mysqlnd_auth.c
@@ -68,6 +63,13 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
6863
[$ext_shared],,
6964
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
7065

66+
AS_VAR_IF([PHP_MYSQLND_SSL], [no],,
67+
[PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD], [
68+
AC_DEFINE([MYSQLND_HAVE_SSL], [1],
69+
[Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.])
70+
PHP_ADD_EXTENSION_DEP(mysqlnd, hash)
71+
])])
72+
7173
PHP_INSTALL_HEADERS([ext/mysqlnd/])
7274
PHP_SUBST([MYSQLND_SHARED_LIBADD])
7375
fi

0 commit comments

Comments
 (0)