From d2f82534cfc5f7ebe6a970e7adac6fed41162afd Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Sat, 25 Jan 2014 21:57:25 +0000 Subject: [PATCH] Try harder to find libcrypt.*, even if there is no static library available. Also look in /usr/lib/*/ for the library, to handle Debian multiarch systems. Based on patch from Andrew Gregory. --- doc/Changelog | 3 +++ src/Makefile | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index bf3bc99..faae011 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -56,6 +56,9 @@ sysvinit (2.89dsf) UNRELEASED; urgency=low * Rename internal functions warn() and shutdown() in the shutdown binary to avoid surprising dynamic library name resolution conflict with NSS modules. Patch from Richard Tollerton. + * Try harder to find libcrypt.*, even if there is no static library + available. Also look in /usr/lib/*/ for the library, to handle + Debian multiarch systems. Based on patch from Andrew Gregory. -- Petter Reinholdtsen Sun Apr 11 11:28:55 CEST 2010 diff --git a/src/Makefile b/src/Makefile index 9e80533..9d17feb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -89,7 +89,12 @@ else endif # Additional libs for GNU libc. -ifneq ($(wildcard /usr/lib*/libcrypt.a),) +ifneq ($(wildcard /usr/lib*/libcrypt.*),) + SULOGINLIBS += -lcrypt +endif + +# Additional libs for GNU libc / multiarch on Debian based systems. +ifneq ($(wildcard /usr/lib/*/libcrypt.*),) SULOGINLIBS += -lcrypt endif