summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-02-18 12:49:57 +1100
committerDamien Miller <djm@mindrot.org>2001-02-18 12:49:57 +1100
commit22d5aa7553d8d88a1662e977c8346eb155a7a044 (patch)
tree75287d5b8008a1520e407bd6e0725aaacbc196cf
parent99e924357eaf5a3f63028d741071370e22746e9c (diff)
- (djm) Swapped tests for no_libsocket and no_libnsl in configure.in.
Patch from Marek Michalkiewicz <marekm@amelek.gda.pl>
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 130a8f395..df5a70e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
12 - (djm) Use ttyname() to determine name of tty returned by openpty() 12 - (djm) Use ttyname() to determine name of tty returned by openpty()
13 rather then risking overflow. Patch from Marek Michalkiewicz 13 rather then risking overflow. Patch from Marek Michalkiewicz
14 <marekm@amelek.gda.pl> 14 <marekm@amelek.gda.pl>
15 - (djm) Swapped tests for no_libsocket and no_libnsl in configure.in.
16 Patch from Marek Michalkiewicz <marekm@amelek.gda.pl>
15 17
1620010217 1820010217
17 - (bal) OpenBSD Sync: 19 - (bal) OpenBSD Sync:
@@ -4019,4 +4021,4 @@
4019 - Wrote replacements for strlcpy and mkdtemp 4021 - Wrote replacements for strlcpy and mkdtemp
4020 - Released 1.0pre1 4022 - Released 1.0pre1
4021 4023
4022$Id: ChangeLog,v 1.788 2001/02/18 01:49:35 djm Exp $ 4024$Id: ChangeLog,v 1.789 2001/02/18 01:49:57 djm Exp $
diff --git a/configure.in b/configure.in
index 2104329c5..3a910f1d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.243 2001/02/16 01:12:41 djm Exp $ 1# $Id: configure.in,v 1.244 2001/02/18 01:49:57 djm Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -317,10 +317,10 @@ AC_ARG_WITH(pcre,
317) 317)
318 318
319# Checks for libraries. 319# Checks for libraries.
320if test -z "$no_libsocket" ; then 320if test -z "$no_libnsl" ; then
321 AC_CHECK_LIB(nsl, yp_match, , ) 321 AC_CHECK_LIB(nsl, yp_match, , )
322fi 322fi
323if test -z "$no_libnsl" ; then 323if test -z "$no_libsocket" ; then
324 AC_CHECK_LIB(socket, main, , ) 324 AC_CHECK_LIB(socket, main, , )
325fi 325fi
326 326