2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f11a62a1..131a90351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20050528
  - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have
    one entry per line to make it easier to merge changes.  ok djm@
+ - (dtucker) [configure.ac] strsep() may be defined in string.h, so check
+   for its presence and include it in the strsep check.
 
 20050527
  - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by
@@ -2619,4 +2621,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3793 2005/05/28 05:58:14 dtucker Exp $
+$Id: ChangeLog,v 1.3794 2005/05/28 06:54:36 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 05b8041ae..7767e9080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.265 2005/05/28 06:01:18 dtucker Exp $
+# $Id: configure.ac,v 1.266 2005/05/28 06:54:36 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -566,6 +566,7 @@ AC_CHECK_HEADERS( \
         shadow.h \
         stddef.h \
         stdint.h \
+        string.h \
         strings.h \
         sys/audit.h \
         sys/bitypes.h \
@@ -1074,8 +1075,15 @@ str = gai_strerror(0);],[
 AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
 
 dnl Make sure prototypes are defined for these before using them.
-AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
 AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
+AC_CHECK_DECL(strsep,
+        [AC_CHECK_FUNCS(strsep)],
+        [],
+        [
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+        ])
 
 dnl tcsendbreak might be a macro
 AC_CHECK_DECL(tcsendbreak,