From 44775cb342d63ec3fbc7eafee604a59c643913a0 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 10 Sep 2018 14:59:49 +0200 Subject: [PATCH] mkpasswd: rename HAVE_XCRYPT to HAVE_XCRYPT_H --- Makefile | 2 +- mkpasswd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01ae5ce..0e9588f 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ 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 +DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT mkpasswd_LDADD += -lxcrypt -DEFS += -DHAVE_XCRYPT -DHAVE_LINUX_CRYPT_GENSALT ifdef HAVE_LINUX_CRYPT_GENSALT # owl and openSUSE have crypt_gensalt(3) in the libc's libcrypt DEFS += -DHAVE_LINUX_CRYPT_GENSALT diff --git a/mkpasswd.c b/mkpasswd.c index 0a888c7..e2c2cbc 100644 --- a/mkpasswd.c +++ b/mkpasswd.c @@ -35,7 +35,7 @@ #include #include #include -#ifdef HAVE_XCRYPT +#ifdef HAVE_XCRYPT_H #include #include #endif