From 80fdfd87f89ddf1640b05c561cae74c6fac51472 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 28 Aug 2024 16:16:35 +0200
Subject: requires libxcrypt >= 4.4

---
 config.m4 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'config.m4')

diff --git a/config.m4 b/config.m4
index b473924..9abcd1e 100644
--- a/config.m4
+++ b/config.m4
@@ -7,14 +7,14 @@ PHP_ARG_ENABLE([xpass],
   [no])
 
 if test "$PHP_XPASS" != "no"; then
-  PKG_CHECK_MODULES([LIBXCRYPT], [libxcrypt])
-  PHP_EVAL_INCLINE($LIBXCRYPT_CFLAGS)
-  PHP_EVAL_LIBLINE($LIBXCRYPT_LIBS, XPASS_SHARED_LIBADD)
+  PKG_CHECK_MODULES([LIBXCRYPT], [libxcrypt >= 4.4])
+  PHP_EVAL_INCLINE([$LIBXCRYPT_CFLAGS])
+  PHP_EVAL_LIBLINE([$LIBXCRYPT_LIBS], [XPASS_SHARED_LIBADD])
 
   old_CFLAGS=$CFLAGS; CFLAGS="$CFLAGS $LIBXCRYPT_CFLAGS"
   old_LDFLAGS=$CFLAGS; LDFLAGS="$CFLAGS $LIBXCRYPT_LIBS"
 
-  AC_MSG_CHECKING(for yescrypt)
+  AC_MSG_CHECKING([for yescrypt])
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <string.h>
 #include <unistd.h>
@@ -27,13 +27,13 @@ int main(void) {
 	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_DEFINE([HAVE_CRYPT_YESCRYPT], [1], [ Have yescrypt hash support ])
     AC_MSG_RESULT([available])
   ], [
     AC_MSG_RESULT([missing])
   ])
 
-  AC_MSG_CHECKING(for sha512)
+  AC_MSG_CHECKING([for sha512 algo])
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <string.h>
 #include <unistd.h>
@@ -46,7 +46,7 @@ int main(void) {
 	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_DEFINE([HAVE_CRYPT_SHA512], [1], [ Have sha512 hash support ])
     AC_MSG_RESULT([available])
   ], [
     AC_MSG_RESULT([missing])
@@ -55,9 +55,9 @@ int main(void) {
   CFLAGS=$old_CFLAGS
   LDFLAGS=$old_LDFLAGS
 
-  PHP_SUBST(XPASS_SHARED_LIBADD)
+  PHP_SUBST([XPASS_SHARED_LIBADD])
 
-  AC_DEFINE(HAVE_XPASS, 1, [ Have xpass support ])
+  AC_DEFINE([HAVE_XPASS], [1], [ Have xpass support ])
 
   PHP_NEW_EXTENSION(xpass, xpass.c, $ext_shared)
 fi
-- 
cgit