Skip to content

Commit 97bfb67

Browse files
zeriyoshiremicollet
authored andcommitted
Fix libxcrypt algorithm detection in config.m4
1 parent e7a9d75 commit 97bfb67

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

config.m4

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ if test "$PHP_XPASS" != "no"; then
1212
PHP_EVAL_LIBLINE([$LIBXCRYPT_LIBS], [XPASS_SHARED_LIBADD])
1313

1414
old_CFLAGS=$CFLAGS; CFLAGS="$CFLAGS $LIBXCRYPT_CFLAGS"
15-
old_LDFLAGS=$LDFLAGS; LDFLAGS="$LIBXCRYPT_LIBS $LDFLAGS"
15+
old_LIBS=$LIBS; LIBS="$LIBS $LIBXCRYPT_LIBS"
1616

17-
AC_MSG_CHECKING([for yescrypt])
17+
AC_MSG_CHECKING([for yescrypt algo])
1818
AC_RUN_IFELSE([AC_LANG_SOURCE([[
1919
#include <string.h>
2020
#include <unistd.h>
2121
#include <crypt.h>
2222
#include <stdlib.h>
23-
#include <string.h>
2423
2524
int main(void) {
2625
char salt[8];
@@ -39,7 +38,6 @@ int main(void) {
3938
#include <unistd.h>
4039
#include <crypt.h>
4140
#include <stdlib.h>
42-
#include <string.h>
4341
4442
int main(void) {
4543
char salt[8];
@@ -53,7 +51,7 @@ int main(void) {
5351
])
5452

5553
CFLAGS=$old_CFLAGS
56-
LDFLAGS=$old_LDFLAGS
54+
LIBS=$old_LIBS
5755

5856
PHP_SUBST([XPASS_SHARED_LIBADD])
5957

0 commit comments

Comments
 (0)