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.

git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@129 456724a4-4300-0410-8514-c89748c515a2

diff --git a/doc/Changelog b/doc/Changelog
index bf3bc994b740a51911867d6927171d391859b91f..faae011d607be7b81fc977c921534af494811e03 100644 (file)
--- 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 <pere@hungry.com>  Sun Apr 11 11:28:55 CEST 2010
 

diff --git a/src/Makefile b/src/Makefile
index 9e80533f7d96dd9d5ab2dea544bc66bdc1b1eb63..9d17febfe7902dd15366e61a213661ebb002b5bf 100644 (file)
--- 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