Skip to content

Commit

Permalink
Remove PHP_SETUP_OPENSSL inactive 3rd argument (php#14323)
Browse files Browse the repository at this point in the history
If OpenSSL is not found, the PKG_CHECK_MODULES errors out already. To
not introduce too big of a BC break with possible PECL extensions using
this macro, it is perhaps simpler to remove this non-working argument.
Redundant macro arguments are ignored by Autoconf anyway.
  • Loading branch information
petk authored Jun 7, 2024
1 parent da86eec commit 5a03ff4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
1 change: 1 addition & 0 deletions UPGRADING.INTERNALS
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
- Added php-config --lib-dir and --lib-embed options for PHP embed SAPI.
- PDO extensions in php-src don't have the include flag -I$pdo_cv_inc_path
directory anymore.
- M4 macro PHP_SETUP_OPENSSL doesn't accept the 3rd argument anymore.

c. Windows build system changes
- The configure options --with-oci8-11g, --with-oci8-12c, --with-oci8-19 have
Expand Down
3 changes: 1 addition & 2 deletions build/php.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ AC_DEFUN([PHP_SETUP_ICU],[
])

dnl
dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
dnl PHP_SETUP_OPENSSL(shared-add [, action-found])
dnl
dnl Common setup macro for openssl.
dnl
Expand All @@ -1807,7 +1807,6 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_CFLAGS)
ifelse([$2],[],:,[$2])
ifelse([$3],[],,[else $3])
fi
])

Expand Down
8 changes: 2 additions & 6 deletions ext/openssl/config0.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@ PHP_ARG_WITH([openssl-legacy-provider],
if test "$PHP_OPENSSL" != "no"; then
PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
PHP_SUBST(OPENSSL_SHARED_LIBADD)
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
], [
AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
])
PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],
[AC_DEFINE([HAVE_OPENSSL_EXT], [1], [ ])])

AC_CHECK_FUNCS([RAND_egd])

Expand Down

0 comments on commit 5a03ff4

Please sign in to comment.