From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 25 Dec 2009 05:19:40 +0000 (-0500)
Subject: [Bug 1435] sntp: Test for -lresolv using the same tests as in ntp
X-Git-Tag: NTP_4_2_6P1_RC2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df55e53be431e32d3c4ce14c433ee48c348218af;p=thirdparty%2Fntp.git

[Bug 1435] sntp: Test for -lresolv using the same tests as in ntp

bk: 4b344b6cNZWZqOxxKFCpNknrz3Tldw
---

diff --git a/ChangeLog b/ChangeLog
index 1582ff765..f66e1ebbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
 * [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
 * [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
+* [Bug 1435] sntp: Test for -lresolv using the same tests as in ntp.
 
 ---
 (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/sntp/configure.ac b/sntp/configure.ac
index 348ad4877..e5ee3822f 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -411,6 +411,9 @@ case "$isc_cv_have_in_port_t" in
 	AC_DEFINE(ISC_PLATFORM_NEEDPORTT, 1, [Declare in_port_t?])
 esac
 
+# HMS: We don't need res_init, but since we may be using cached 
+# values from ntpd we need to test the same way 
+AC_SEARCH_LIBS([res_init], [resolv], , , [-lsocket -lnsl]) 
 AC_SEARCH_LIBS([inet_ntop], [resolv], , , [-lsocket -lnsl])
 AC_CHECK_FUNC(inet_ntop, [], [AC_DEFINE(ISC_PLATFORM_NEEDNTOP, 1, [ISC: provide inet_ntop()])])
 AC_CHECK_FUNC(inet_pton, [], [AC_DEFINE(ISC_PLATFORM_NEEDPTON, 1, [ISC: provide inet_pton()])])