diff options
| author | Go Kudo <zeriyoshi@gmail.com> | 2024-09-01 17:39:07 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-09-01 17:39:07 +0200 |
| commit | 97bfb675b3eb76f7f21dbad34cf454f8a4a4dceb (patch) | |
| tree | f370775e0bb54562c45fae5a344bd59b857f4fa7 /config.m4 | |
| parent | e7a9d757ed7c5af0f6c8af622410358a91066007 (diff) | |
Fix libxcrypt algorithm detection in config.m4
Diffstat (limited to 'config.m4')
| -rw-r--r-- | config.m4 | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -12,15 +12,14 @@ if test "$PHP_XPASS" != "no"; then PHP_EVAL_LIBLINE([$LIBXCRYPT_LIBS], [XPASS_SHARED_LIBADD]) old_CFLAGS=$CFLAGS; CFLAGS="$CFLAGS $LIBXCRYPT_CFLAGS" - old_LDFLAGS=$LDFLAGS; LDFLAGS="$LIBXCRYPT_LIBS $LDFLAGS" + old_LIBS=$LIBS; LIBS="$LIBS $LIBXCRYPT_LIBS" - AC_MSG_CHECKING([for yescrypt]) + AC_MSG_CHECKING([for yescrypt algo]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <string.h> #include <unistd.h> #include <crypt.h> #include <stdlib.h> -#include <string.h> int main(void) { char salt[8]; @@ -39,7 +38,6 @@ int main(void) { #include <unistd.h> #include <crypt.h> #include <stdlib.h> -#include <string.h> int main(void) { char salt[8]; @@ -53,7 +51,7 @@ int main(void) { ]) CFLAGS=$old_CFLAGS - LDFLAGS=$old_LDFLAGS + LIBS=$old_LIBS PHP_SUBST([XPASS_SHARED_LIBADD]) |