from diffutils-2.8.2.

[gnulib.git] / m4 / lib-check.m4

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index fe5895a..15ffe54 100644 (file)
--- 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.