mkpasswd: update the libowcrypt Makefile section

Distributions which have crypt_gensalt in libowcrypt now should define
a HAVE_LIBOWCRYPT=1 Makefile variable.

2 files changed, 5 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 0e9588f..bd12220 100644
--- a/Makefile
+++ b/Makefile
@@ -57,10 +57,11 @@ mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)
 else ifdef HAVE_XCRYPT
 DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT
 mkpasswd_LDADD += -lxcrypt
-ifdef HAVE_LINUX_CRYPT_GENSALT
-# owl and openSUSE have crypt_gensalt(3) in the libc's libcrypt
-DEFS += -DHAVE_LINUX_CRYPT_GENSALT
-endif
+else ifdef HAVE_LIBOWCRYPT
+# owl and openSUSE have crypt_gensalt(3) in libowcrypt
+DEFS += -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE
+mkpasswd_LDADD += -lcrypt -lowcrypt
+else
 mkpasswd_LDADD += -lcrypt
 endif
 
diff --git a/mkpasswd.c b/mkpasswd.c
index e2c2cbc..7450ad3 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -40,7 +40,6 @@
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_LINUX_CRYPT_GENSALT
-#define _OW_SOURCE
 #include <crypt.h>
 #endif
 #ifdef HAVE_GETTIMEOFDAY