Skip to content

Commit 5a03ff4

Browse files
authored
Remove PHP_SETUP_OPENSSL inactive 3rd argument (#14323)
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 da86eec commit 5a03ff4

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
@@ -141,6 +141,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
141141
- Added php-config --lib-dir and --lib-embed options for PHP embed SAPI.
142142
- PDO extensions in php-src don't have the include flag -I$pdo_cv_inc_path
143143
directory anymore.
144+
- M4 macro PHP_SETUP_OPENSSL doesn't accept the 3rd argument anymore.
144145

145146
c. Windows build system changes
146147
- 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
@@ -1794,7 +1794,7 @@ AC_DEFUN([PHP_SETUP_ICU],[
17941794
])
17951795

17961796
dnl
1797-
dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
1797+
dnl PHP_SETUP_OPENSSL(shared-add [, action-found])
17981798
dnl
17991799
dnl Common setup macro for openssl.
18001800
dnl
@@ -1807,7 +1807,6 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
18071807
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
18081808
PHP_EVAL_INCLINE($OPENSSL_CFLAGS)
18091809
ifelse([$2],[],:,[$2])
1810-
ifelse([$3],[],,[else $3])
18111810
fi
18121811
])
18131812

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)