summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-01-28 15:07:10 +1100
committerDamien Miller <djm@mindrot.org>2014-01-28 15:07:10 +1100
commitab0394905884dc6e58c3721211c6b38fb8fc2ca8 (patch)
treedb490b8f266a665d6d38c7002619ec8c795f97e5
parent4ab20a82d4d4168d62318923f62382f6ef242fcd (diff)
- (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
ok dtucker
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ca3979b67..a2be7f8be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120140128
2 - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
3 ok dtucker
4
120140127 520140127
2 - (dtucker) [Makefile.in] Remove trailing backslash which some make 6 - (dtucker) [Makefile.in] Remove trailing backslash which some make
3 implementations (eg older Solaris) do not cope with. 7 implementations (eg older Solaris) do not cope with.
diff --git a/configure.ac b/configure.ac
index ce881e279..62229b640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.564 2014/01/25 22:46:54 djm Exp $ 1# $Id: configure.ac,v 1.565 2014/01/28 04:07:10 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.564 $) 18AC_REVISION($Revision: 1.565 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1240,6 +1240,9 @@ AC_SEARCH_LIBS([openpty], [util bsd])
1240AC_SEARCH_LIBS([updwtmp], [util bsd]) 1240AC_SEARCH_LIBS([updwtmp], [util bsd])
1241AC_CHECK_FUNCS([fmt_scaled scan_scaled login logout openpty updwtmp logwtmp]) 1241AC_CHECK_FUNCS([fmt_scaled scan_scaled login logout openpty updwtmp logwtmp])
1242 1242
1243# On some platforms, inet_ntop may be found in libresolv or libnsl.
1244AC_SEARCH_LIBS([inet_ntop], [resolv nsl])
1245
1243AC_FUNC_STRFTIME 1246AC_FUNC_STRFTIME
1244 1247
1245# Check for ALTDIRFUNC glob() extension 1248# Check for ALTDIRFUNC glob() extension