X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flib-check.m4;h=15ffe542d60e40c913674423d38eb232cfebc137;hb=c33ba009d3c39d933ecbb68cfb468ef3526cb4fd;hp=fe5895a38eb7d2b20c600396d3df5d7630019e46;hpb=345b05ad77d79c84374008dcbc3cbd1d879c7e93;p=gnulib.git

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index fe5895a38..15ffe542d 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,8 +1,8 @@
-#serial 3
+#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.
@@ -42,10 +42,17 @@ AC_DEFUN(jm_LIB_CHECK,
   # 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 spwd.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.