From e5a5f90b16b72ccb1822853ca6dd81d1f4bfb080 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 12 Aug 2005 23:37:33 +0000
Subject: [PATCH] Fix struct passwd detection

---
 configure    | 12 ++++++++----
 configure.in |  6 ++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index c6ce7b0265..eeda874b0e 100755
--- a/configure
+++ b/configure
@@ -47891,7 +47891,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <pwd.h>
+
 int
 main ()
 {
@@ -47935,7 +47936,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <pwd.h>
+
 int
 main ()
 {
@@ -48001,7 +48003,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <pwd.h>
+
 int
 main ()
 {
@@ -48045,7 +48048,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <pwd.h>
+
 int
 main ()
 {
diff --git a/configure.in b/configure.in
index 6320ff08cb..7f6d65fc19 100644
--- a/configure.in
+++ b/configure.in
@@ -2416,8 +2416,8 @@ OL_TYPE_SIG_ATOMIC_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_CHECK_MEMBERS([struct stat.st_blksize])
-AC_CHECK_MEMBERS([struct passwd.pw_gecos])
-AC_CHECK_MEMBERS([struct passwd.pw_passwd])
+AC_CHECK_MEMBERS([struct passwd.pw_gecos],,,[#include <pwd.h>])
+AC_CHECK_MEMBERS([struct passwd.pw_passwd],,,[#include <pwd.h>])
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -2456,9 +2456,7 @@ if test $ac_cv_func_memcmp_working = no ; then
 		[define if memcmp is not 8-bit clean or is otherwise broken])
 fi
 
-dnl AC_FUNC_MKTIME([]) dnl checks for sys/time.h and unistd.h
 AC_FUNC_STRFTIME
-dnl AC_FUNC_STRTOD([])
 
 OL_FUNC_INET_ATON