nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkpasswd: update the libowcrypt Makefile section

Browse Source 
Distributions which have crypt_gensalt in libowcrypt now should define
a HAVE_LIBOWCRYPT=1 Makefile variable.
This commit is contained in:
Marco d'Itri 2018-09-11 01:15:34 +02:00
parent 44775cb342
commit c1cb4b2ca0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -57,10 +57,11 @@ mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)
else ifdef HAVE_XCRYPT else ifdef HAVE_XCRYPT
DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT
mkpasswd_LDADD += -lxcrypt mkpasswd_LDADD += -lxcrypt
ifdef HAVE_LINUX_CRYPT_GENSALT else ifdef HAVE_LIBOWCRYPT
# owl and openSUSE have crypt_gensalt(3) in the libc's libcrypt # owl and openSUSE have crypt_gensalt(3) in libowcrypt
DEFS += -DHAVE_LINUX_CRYPT_GENSALT DEFS += -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE
endif mkpasswd_LDADD += -lcrypt -lowcrypt
else
mkpasswd_LDADD += -lcrypt mkpasswd_LDADD += -lcrypt
endif endif

1
mkpasswd.c
View File

@ -40,7 +40,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef HAVE_LINUX_CRYPT_GENSALT #ifdef HAVE_LINUX_CRYPT_GENSALT
#define _OW_SOURCE
#include <crypt.h> #include <crypt.h>
#endif #endif
#ifdef HAVE_GETTIMEOFDAY #ifdef HAVE_GETTIMEOFDAY