[Bug 1657] darwin needs res_9_init, not res_init.

bk: 4ca6e10essiQdnShOOb7eOM1Ja6CeA

diff --git a/ChangeLog b/ChangeLog
index 3c9a530df24885c2c4325374e10f0a4b23ee9eb1..2c9eff1e51bdc908da07d3bc934baa28be54a545 100644 (file)
--- 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 83fe9f82c5aff1d8c47374f0fa3bb7e3db930269..66e993549fd846cac1081155abd907b412abf640 100644 (file)
--- 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])])