summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-28 11:33:42 +1100
committerDamien Miller <djm@mindrot.org>2003-01-28 11:33:42 +1100
commitcd6853c31c226d4538f0a46b4ebcdcc734d4b6c0 (patch)
treec96509a2f4c8d4da839edb32c9c1f5c0e4e5eae1
parent6dc562a7aacbedbf9d2dfcef19fcba19c226b453 (diff)
- (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au
and openssh-unix-dev@thewrittenword.com
-rw-r--r--ChangeLog6
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac4
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dd3bc6f5..f6a07fd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
1200301028
2 - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au
3 and openssh-unix-dev@thewrittenword.com
4
1200301027 5200301027
2 - (bal) Bugzilla 477 patch by wendyp@cray.com. Define TIOCGPGRP for 6 - (bal) Bugzilla 477 patch by wendyp@cray.com. Define TIOCGPGRP for
3 cray. Also removed test for tcgetpgrp in configure.ac since it 7 cray. Also removed test for tcgetpgrp in configure.ac since it
@@ -1079,4 +1083,4 @@
1079 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1083 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1080 ok provos@ 1084 ok provos@
1081 1085
1082$Id: ChangeLog,v 1.2588 2003/01/27 21:15:10 mouring Exp $ 1086$Id: ChangeLog,v 1.2589 2003/01/28 00:33:42 djm Exp $
diff --git a/acconfig.h b/acconfig.h
index cf5f961f2..b28966084 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.147 2003/01/12 23:04:59 djm Exp $ */ 1/* $Id: acconfig.h,v 1.148 2003/01/28 00:33:44 djm Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -371,6 +371,9 @@
371#undef SETPROCTITLE_STRATEGY 371#undef SETPROCTITLE_STRATEGY
372#undef SETPROCTITLE_PS_PADDING 372#undef SETPROCTITLE_PS_PADDING
373 373
374/* Some systems put this outside of libc */
375#undef HAVE_NANOSLEEP
376
374@BOTTOM@ 377@BOTTOM@
375 378
376/* ******************* Shouldn't need to edit below this line ************** */ 379/* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.ac b/configure.ac
index 870def2ae..f66104e78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.103 2003/01/27 21:15:10 mouring Exp $ 1# $Id: configure.ac,v 1.104 2003/01/28 00:33:44 djm Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -612,6 +612,8 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
612 socketpair strerror strlcat strlcpy strmode strnvis sysconf \ 612 socketpair strerror strlcat strlcpy strmode strnvis sysconf \
613 truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) 613 truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
614 614
615AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
616
615dnl Make sure strsep prototype is defined before defining HAVE_STRSEP 617dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
616AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)]) 618AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
617 619