libcrypt-util: use build-time check for crypt_preferred_method

After systemd#16981 only the presence of crypt_gensalt_ra
is checked, but there are cases where that function is available but crypt_preferred_method
is not, and they are used in the same ifdef.
Add a check for the latter as well.

meson.build

@@ -884,8 +884,9 @@ libcrypt = cc.find_library('crypt')
 
 crypt_header = conf.get('HAVE_CRYPT_H') == 1 ? '''#include <crypt.h>''' : '''#include <unistd.h>'''
 foreach ident : [
-        ['crypt_ra',          crypt_header],
-        ['crypt_gensalt_ra',  crypt_header]]
+        ['crypt_ra',               crypt_header],
+        ['crypt_preferred_method', crypt_header],
+        ['crypt_gensalt_ra',       crypt_header]]
 
         have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE',
                                dependencies : libcrypt)

src/shared/libcrypt-util.c

@@ -31,7 +31,7 @@
 
 int make_salt(char **ret) {
 
-#if HAVE_CRYPT_GENSALT_RA
+#if HAVE_CRYPT_GENSALT_RA && HAVE_CRYPT_PREFERRED_METHOD
         const char *e;
         char *salt;