From 5fc64b5eba57177aa5956bfd0ba274e4782f8078 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 9 Sep 2018 00:59:49 +0200 Subject: [PATCH] mkpasswd: support the new libxcrypt 4.x --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 608184d..01ae5ce 100644 --- a/Makefile +++ b/Makefile @@ -51,10 +51,12 @@ whois_OBJECTS += simple_recode.o DEFS += -DHAVE_ICONV endif -ifdef HAVE_XCRYPT +ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),) +DEFS += -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt) +mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt) +else ifdef HAVE_XCRYPT mkpasswd_LDADD += -lxcrypt DEFS += -DHAVE_XCRYPT -DHAVE_LINUX_CRYPT_GENSALT -else ifdef HAVE_LINUX_CRYPT_GENSALT # owl and openSUSE have crypt_gensalt(3) in the libc's libcrypt DEFS += -DHAVE_LINUX_CRYPT_GENSALT