fix

Author: zeriyoshi

config.m4

@@ -12,34 +12,39 @@ if test "$PHP_XPASS" != "no"; then
   PHP_EVAL_LIBLINE([$LIBXCRYPT_LIBS], [XPASS_SHARED_LIBADD])
 
   old_CFLAGS=$CFLAGS; CFLAGS="$CFLAGS $LIBXCRYPT_CFLAGS"
-  old_LIBS="$LIBS"; LIBS="$LIBXCRYPT_LIBS"
+  old_LDFLAGS=$LDFLAGS; LDFLAGS="$LIBXCRYPT_LIBS $LDFLAGS"
+  old_LIBS=$LIBS; LIBS="$LIBS $LIBXCRYPT_LIBS"
 
   AC_MSG_CHECKING([for yescrypt])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-      #include <crypt.h>
-      #include <string.h>
-  ]], [[
-      struct crypt_data data;
-      memset(&data, 0, sizeof(data));
-      char *result = crypt_r("password", "$y$", &data);
-      return (result != NULL && strncmp(result, "$y$", 3) == 0) ? 0 : 1;
-  ]])], [
-      AC_MSG_RESULT([available])
-      AC_DEFINE([HAVE_CRYPT_YESCRYPT], [1], [ Have yescrypt hash support ])
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
+#include <unistd.h>
+#include <crypt.h>
+#include <stdlib.h>
+
+int main(void) {
+    char salt[8];
+	salt[0]='$'; salt[1]='y'; salt[2]='$'; salt[3]=0;
+	return crypt_gensalt(salt, 0, NULL, 0) ? 0 : 1;
+}]])],[
+    AC_DEFINE([HAVE_CRYPT_YESCRYPT], [1], [ Have yescrypt hash support ])
+    AC_MSG_RESULT([available])
   ], [
-      AC_MSG_RESULT([missing])
+    AC_MSG_RESULT([missing])
   ])
 
   AC_MSG_CHECKING([for sha512 algo])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-      #include <crypt.h>
-      #include <string.h>
-  ]], [[
-      struct crypt_data data;
-      memset(&data, 0, sizeof(data));
-      char *result = crypt_r("password", "$6$salt", &data);
-      return (result != NULL && strncmp(result, "$6$", 3) == 0) ? 0 : 1;
-  ]])],[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
+#include <unistd.h>
+#include <crypt.h>
+#include <stdlib.h>
+
+int main(void) {
+    char salt[8];
+	salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]=0;
+	return crypt_gensalt(salt, 0, NULL, 0) ? 0 : 1;
+}]])],[
     AC_DEFINE([HAVE_CRYPT_SHA512], [1], [ Have sha512 hash support ])
     AC_MSG_RESULT([available])
   ], [
@@ -48,6 +53,7 @@ if test "$PHP_XPASS" != "no"; then
 
   CFLAGS=$old_CFLAGS
   LDFLAGS=$old_LDFLAGS
+  LIBS=$old_LIBS
 
   PHP_SUBST([XPASS_SHARED_LIBADD])