- (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;

   ok dtucker

diff --git a/ChangeLog b/ChangeLog
index ca3979b67a8d56b5870e3f124c2e889e9d0b39bf..a2be7f8beaed37f8b6781f51cd2d2bf0a7ab453c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20140128
+ - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
+   ok dtucker
+
 20140127
  - (dtucker) [Makefile.in] Remove trailing backslash which some make
    implementations (eg older Solaris) do not cope with.

diff --git a/configure.ac b/configure.ac
index ce881e2793cc60e62339fede094b40b56e74b70d..62229b64053ec17de165d855a6c83471b0a435d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.564 2014/01/25 22:46:54 djm Exp $
+# $Id: configure.ac,v 1.565 2014/01/28 04:07:10 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.564 $)
+AC_REVISION($Revision: 1.565 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1240,6 +1240,9 @@ AC_SEARCH_LIBS([openpty], [util bsd])
 AC_SEARCH_LIBS([updwtmp], [util bsd])
 AC_CHECK_FUNCS([fmt_scaled scan_scaled login logout openpty updwtmp logwtmp])
 
+# On some platforms, inet_ntop may be found in libresolv or libnsl.
+AC_SEARCH_LIBS([inet_ntop], [resolv nsl])
+
 AC_FUNC_STRFTIME
 
 # Check for ALTDIRFUNC glob() extension