summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dbaff6e52..102a8c0fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 ifdef lost during sync. Spotted by tim@. 3 ifdef lost during sync. Spotted by tim@.
4 - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag. 4 - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.
5 - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test. 5 - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test.
6 - (dtucker) [configure.ac] Remove duplicate utimes() check. ok djm@
6 7
720051110 820051110
8 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from 9 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
@@ -3298,4 +3299,4 @@
3298 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3299 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3299 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3300 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3300 3301
3301$Id: ChangeLog,v 1.3993 2005/11/12 04:20:52 dtucker Exp $ 3302$Id: ChangeLog,v 1.3994 2005/11/12 07:42:36 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 89f19a513..2885a69fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.306 2005/11/12 04:20:53 dtucker Exp $ 1# $Id: configure.ac,v 1.307 2005/11/12 07:42:37 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -848,7 +848,7 @@ dnl UnixWare 2.x
848AC_CHECK_FUNC(strcasecmp, 848AC_CHECK_FUNC(strcasecmp,
849 [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ] 849 [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
850) 850)
851AC_CHECK_FUNC(utimes, 851AC_CHECK_FUNCS(utimes,
852 [], [ AC_CHECK_LIB(c89, utimes, [AC_DEFINE(HAVE_UTIMES) 852 [], [ AC_CHECK_LIB(c89, utimes, [AC_DEFINE(HAVE_UTIMES)
853 LIBS="$LIBS -lc89"]) ] 853 LIBS="$LIBS -lc89"]) ]
854) 854)
@@ -1181,7 +1181,6 @@ AC_CHECK_FUNCS( \
1181 truncate \ 1181 truncate \
1182 unsetenv \ 1182 unsetenv \
1183 updwtmpx \ 1183 updwtmpx \
1184 utimes \
1185 vhangup \ 1184 vhangup \
1186 vsnprintf \ 1185 vsnprintf \
1187 waitpid \ 1186 waitpid \