Skip to content

Commit 4e46f52

Browse files
committed
Remove PHP_SETUP_OPENSSL inactive 3rd argument
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.
1 parent 8a24e31 commit 4e46f52

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

UPGRADING.INTERNALS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
138138
- M4 macro PHP_CHECK_GCC_ARG has been removed since PHP 8.0 (use
139139
AX_CHECK_COMPILE_FLAG).
140140
- Added php-config --lib-dir and --lib-embed options for PHP embed SAPI.
141+
- M4 macro PHP_SETUP_OPENSSL doesn't accept the 3rd argument anymore.
141142

142143
c. Windows build system changes
143144
- The configure options --with-oci8-11g, --with-oci8-12c, --with-oci8-19 have

build/php.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,7 +1812,7 @@ AC_DEFUN([PHP_SETUP_ICU],[
18121812
])
18131813

18141814
dnl
1815-
dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
1815+
dnl PHP_SETUP_OPENSSL(shared-add [, action-found])
18161816
dnl
18171817
dnl Common setup macro for openssl.
18181818
dnl
@@ -1825,7 +1825,6 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
18251825
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
18261826
PHP_EVAL_INCLINE($OPENSSL_CFLAGS)
18271827
ifelse([$2],[],:,[$2])
1828-
ifelse([$3],[],,[else $3])
18291828
fi
18301829
])
18311830

ext/openssl/config0.m4

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ PHP_ARG_WITH([openssl-legacy-provider],
2020
if test "$PHP_OPENSSL" != "no"; then
2121
PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
2222
PHP_SUBST(OPENSSL_SHARED_LIBADD)
23-
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
24-
[
25-
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
26-
], [
27-
AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
28-
])
23+
PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],
24+
[AC_DEFINE([HAVE_OPENSSL_EXT], [1], [ ])])
2925

3026
AC_CHECK_FUNCS([RAND_egd])
3127

0 commit comments

Comments
 (0)