From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 2 Oct 2010 07:36:46 +0000 (-0700)
Subject: [Bug 1657] darwin needs res_9_init, not res_init.
X-Git-Tag: NTP_4_2_7P59~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8784c97b9e2f2055b27a73117c64433e63c6b0a;p=thirdparty%2Fntp.git

[Bug 1657] darwin needs res_9_init, not res_init.

bk: 4ca6e10essiQdnShOOb7eOM1Ja6CeA
---

diff --git a/ChangeLog b/ChangeLog
index 3c9a530df..2c9eff1e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1657] darwin needs res_9_init, not res_init.
 (4.2.7p58) 2010/09/30 Released by Harlan Stenn <stenn@ntp.org>
 * Clock select bugfix from Dave Mills.
 * [Bug 1554]: peer may stay selected as system peer after becoming
diff --git a/configure.ac b/configure.ac
index 83fe9f82c..66e993549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,10 +414,12 @@ case "$host" in
     ;;
 esac
 
-AC_SEARCH_LIBS([res_init], [resolv])
-case "$ac_search_func_res_init:$host" in
- no:*-*-darwin*)
+case "$host" in
+ *-*-darwin*)
     AC_SEARCH_LIBS([res_9_init], [resolv])
+    ;;
+ *) AC_SEARCH_LIBS([res_init], [resolv])
+    ;;
 esac
 AC_HEADER_RESOLV
 AC_CHECK_FUNCS([res_init], , [AC_CHECK_FUNCS([__res_init])])