From 97bfb675b3eb76f7f21dbad34cf454f8a4a4dceb Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Sun, 1 Sep 2024 17:39:07 +0200 Subject: Fix libxcrypt algorithm detection in config.m4 --- config.m4 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config.m4 b/config.m4 index f1fcb05..fb6b2e7 100644 --- a/config.m4 +++ b/config.m4 @@ -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 #include #include #include -#include int main(void) { char salt[8]; @@ -39,7 +38,6 @@ int main(void) { #include #include #include -#include 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]) -- cgit