X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flib-check.m4;h=0e4cc3a47a117d7611f23ad46c55e8cf4c05d62c;hb=26dec442ee2a74795222566b0888ccb0fe592108;hp=5b13f01b32982e88fa564945db4fb52e8ec0e52e;hpb=c599b80e751f35a31c5e8272f49e27900a536b01;p=gnulib.git

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index 5b13f01b3..0e4cc3a47 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 4
 
 dnl Misc lib-related macros for fileutils, sh-utils, textutils.
 
@@ -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.