@@ -25,7 +25,9 @@ PHP_ARG_WITH([openssl-argon2],
25
25
[ no] )
26
26
27
27
if test "$PHP_OPENSSL" != "no"; then
28
- PHP_NEW_EXTENSION([ openssl] , [ openssl.c openssl_pwhash.c xp_ssl.c] , [ $ext_shared] )
28
+ PHP_NEW_EXTENSION([ openssl] ,
29
+ [ openssl.c openssl_pwhash.c xp_ssl.c] ,
30
+ [ $ext_shared] )
29
31
PHP_SUBST([ OPENSSL_SHARED_LIBADD] )
30
32
PHP_SETUP_OPENSSL([ OPENSSL_SHARED_LIBADD] ,
31
33
[ AC_DEFINE ( [ HAVE_OPENSSL_EXT] , [ 1] ,
@@ -46,13 +48,14 @@ if test "$PHP_OPENSSL" != "no"; then
46
48
[ Define to 1 to load the OpenSSL legacy algorithm provider in addition to
47
49
the default provider.] ) ] )
48
50
49
- if test "$ PHP_OPENSSL_ARGON2" != "no"; then
50
- if test "$ PHP_THREAD_SAFETY" != "no"; then
51
- AC_MSG_ERROR ( [ Not supported in ZTS mode for now] )
52
- fi
51
+ AS_VAR_IF ( [ PHP_OPENSSL_ARGON2] , [ no ] ,, [
52
+ AS_VAR_IF ( [ PHP_THREAD_SAFETY] , [ yes ] ,
53
+ [ AC_MSG_ERROR ( [ Not supported in ZTS mode for now] ) ] )
54
+
53
55
PHP_CHECK_LIBRARY([ crypto] , [ OSSL_set_max_threads] ,
54
- [ AC_DEFINE ( [ HAVE_OPENSSL_ARGON2] , [ 1] , [ Define to 1 to enable argon2 password hashing ] ) ] ,
56
+ [ AC_DEFINE ( [ HAVE_OPENSSL_ARGON2] , [ 1] ,
57
+ [ Define to 1 to enable OpenSSL argon2 password hashing.] ) ] ,
55
58
[ AC_MSG_ERROR ( [ argon2 hashing requires OpenSSL 3.2] ) ] ,
56
59
[ $OPENSSL_LIBS] )
57
- fi
60
+ ] )
58
61
fi
0 commit comments