Skip to content

Fix libxcrypt algorithm detection in config.m4 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix libxcrypt algorithm detection in config.m4 #1

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c70b1d1
fix config.m4
zeriyoshi Aug 29, 2024
726dadd
fix message
zeriyoshi Aug 29, 2024
3a848da
fix
zeriyoshi Aug 30, 2024
be9c7e6
fix twice option
zeriyoshi Aug 31, 2024
42cf224
fix unused LDFLAGS definition
zeriyoshi Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ 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_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please drop this no-effect line

old_LIBS=$LIBS; LIBS="$LIBS $LIBXCRYPT_LIBS"

AC_MSG_CHECKING([for yescrypt])
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];
Expand All @@ -39,7 +39,6 @@ int main(void) {
#include <unistd.h>
#include <crypt.h>
#include <stdlib.h>
#include <string.h>

int main(void) {
char salt[8];
Expand All @@ -54,6 +53,7 @@ int main(void) {

CFLAGS=$old_CFLAGS
LDFLAGS=$old_LDFLAGS
LIBS=$old_LIBS

PHP_SUBST([XPASS_SHARED_LIBADD])

Expand Down