summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac12
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 @@
120050528 120050528
2 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have 2 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have
3 one entry per line to make it easier to merge changes. ok djm@ 3 one entry per line to make it easier to merge changes. ok djm@
4 - (dtucker) [configure.ac] strsep() may be defined in string.h, so check
5 for its presence and include it in the strsep check.
4 6
520050527 720050527
6 - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by 8 - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by
@@ -2619,4 +2621,4 @@
2619 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2621 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2620 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2622 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2621 2623
2622$Id: ChangeLog,v 1.3793 2005/05/28 05:58:14 dtucker Exp $ 2624$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 @@
1# $Id: configure.ac,v 1.265 2005/05/28 06:01:18 dtucker Exp $ 1# $Id: configure.ac,v 1.266 2005/05/28 06:54:36 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -566,6 +566,7 @@ AC_CHECK_HEADERS( \
566 shadow.h \ 566 shadow.h \
567 stddef.h \ 567 stddef.h \
568 stdint.h \ 568 stdint.h \
569 string.h \
569 strings.h \ 570 strings.h \
570 sys/audit.h \ 571 sys/audit.h \
571 sys/bitypes.h \ 572 sys/bitypes.h \
@@ -1074,8 +1075,15 @@ str = gai_strerror(0);],[
1074AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) 1075AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
1075 1076
1076dnl Make sure prototypes are defined for these before using them. 1077dnl Make sure prototypes are defined for these before using them.
1077AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
1078AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)]) 1078AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
1079AC_CHECK_DECL(strsep,
1080 [AC_CHECK_FUNCS(strsep)],
1081 [],
1082 [
1083#ifdef HAVE_STRING_H
1084# include <string.h>
1085#endif
1086 ])
1079 1087
1080dnl tcsendbreak might be a macro 1088dnl tcsendbreak might be a macro
1081AC_CHECK_DECL(tcsendbreak, 1089AC_CHECK_DECL(tcsendbreak,