X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flib-check.m4;h=15ffe542d60e40c913674423d38eb232cfebc137;hb=ee76465ad82c04707c78ff3ed723358217c9e34f;hp=5b13f01b32982e88fa564945db4fb52e8ec0e52e;hpb=c599b80e751f35a31c5e8272f49e27900a536b01;p=gnulib.git

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index 5b13f01b3..15ffe542d 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,8 +1,8 @@
-#serial 2
+#serial 5
 
 dnl Misc lib-related macros for fileutils, sh-utils, textutils.
 
-AC_DEFUN(jm_LIB_CHECK,
+AC_DEFUN([jm_LIB_CHECK],
 [
 
   # Check for libypsec.a on Dolphin M88K machines.
@@ -39,13 +39,20 @@ AC_DEFUN(jm_LIB_CHECK,
   AC_SEARCH_LIBS(yp_match, [sun ypsec])
 
   # SysV needs -lsec, older versions of Linux need -lshadow for
-  # shadow passwords.
-  AC_SEARCH_LIBS(getspnam, [shadow sec])
+  # shadow passwords.  UnixWare 7 needs -lgen.
+  AC_SEARCH_LIBS(getspnam, [shadow sec gen])
+
+  AC_CHECK_HEADERS(shadow.h)
 
   # Requirements for su.c.
-  AC_CHECK_MEMBERS((struct passwd.sp_pwdp))
+  shadow_includes="\
+$ac_includes_default
+#if HAVE_SHADOW_H
+# include <shadow.h>
+#endif
+"
+  AC_CHECK_MEMBERS([struct spwd.sp_pwdp],,,[$shadow_includes])
   AC_CHECK_FUNCS(getspnam)
-  AC_CHECK_HEADERS(shadow.h)
 
   # SCO-ODT-3.0 is reported to need -lufc for crypt.
   # NetBSD needs -lcrypt for crypt.