Skip to content

Add configure phase dependencies to mysqlnd extension#15380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petk merged 1 commit into from
Aug 13, 2024
Merged

Add configure phase dependencies to mysqlnd extension #15380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/mysqlnd/config.w32
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ if (PHP_MYSQLND != "no") {
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
if (CHECK_LIB("crypt32.lib", "mysqlnd")) {
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.");
ADD_EXTENSION_DEP('mysqlnd', 'hash');
}
}
PHP_INSTALL_HEADERS("", "ext/mysqlnd");
Expand Down
12 changes: 7 additions & 5 deletions ext/mysqlnd/config9.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,6 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
AC_DEFINE([MYSQLND_SSL_SUPPORTED], [1],
[Define to 1 if mysqlnd core SSL is enabled.])

AS_VAR_IF([PHP_MYSQLND_SSL], [no],,
[PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD],
[AC_DEFINE([MYSQLND_HAVE_SSL], [1],
[Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.])])])

PHP_NEW_EXTENSION([mysqlnd], m4_normalize([
mysqlnd_alloc.c
mysqlnd_auth.c
Expand DownExpand Up@@ -68,6 +63,13 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
[$ext_shared],,
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])

AS_VAR_IF([PHP_MYSQLND_SSL], [no],,
[PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD], [
AC_DEFINE([MYSQLND_HAVE_SSL], [1],
[Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.])
PHP_ADD_EXTENSION_DEP(mysqlnd, hash)
])])

PHP_INSTALL_HEADERS([ext/mysqlnd/])
PHP_SUBST([MYSQLND_SHARED_LIBADD])
fi