- (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au

   and openssh-unix-dev@thewrittenword.com

diff --git a/ChangeLog b/ChangeLog
index 2dd3bc6f5d7c2ce1864e0697100592701a5c2836..f6a07fd91d6552bfef7117249a0ee89853cb3012 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+200301028
+ - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au 
+   and openssh-unix-dev@thewrittenword.com 
+
 200301027
  - (bal) Bugzilla 477 patch by wendyp@cray.com.  Define TIOCGPGRP for
    cray.  Also removed test for tcgetpgrp in configure.ac since it
@@ -1079,4 +1083,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2588 2003/01/27 21:15:10 mouring Exp $
+$Id: ChangeLog,v 1.2589 2003/01/28 00:33:42 djm Exp $

diff --git a/acconfig.h b/acconfig.h
index cf5f961f20571019e38f16b3ad947999d6284fd2..b289660844ac951c7c1c4253fbb4bf38822abd8b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.147 2003/01/12 23:04:59 djm Exp $ */
+/* $Id: acconfig.h,v 1.148 2003/01/28 00:33:44 djm Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -371,6 +371,9 @@
 #undef SETPROCTITLE_STRATEGY
 #undef SETPROCTITLE_PS_PADDING
 
+/* Some systems put this outside of libc */
+#undef HAVE_NANOSLEEP
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */

diff --git a/configure.ac b/configure.ac
index 870def2ae1e12df8cbc48eb9107aad14ed05c7f0..f66104e78627914ef65e65cd22d1da6ba30bd772 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.103 2003/01/27 21:15:10 mouring Exp $
+# $Id: configure.ac,v 1.104 2003/01/28 00:33:44 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -612,6 +612,8 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
        socketpair strerror strlcat strlcpy strmode strnvis sysconf \
        truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
 
+AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
+
 dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
 AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])