From 0362299f47367789e16450f7fc87f3d1fe0f424a Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Fri, 5 May 2000 11:39:25 +0000
Subject: [PATCH] su doesn't work on Solaris2.6. When checking for struct
 spwd.sp_pwdp, also include <shadow.h>.  Reported by Dragos Harabor.

---
 m4/lib-check.m4 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index fe5895a38e..4439b779a2 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -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.
-- 
2.30.2