Fix check for -lipv6 on HP-UX 11

bk: 4d311d349B5_6mw1uCaxAtXbnbJO2g

diff --git a/ChangeLog b/ChangeLog
index 07f51dd6b93a0e655b75c1e408040a00e71fa6a7..1fe43a036b5f2d6d7191f8e9a1916b8245ff443c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix check for -lipv6 on HP-UX 11.
 (4.2.7p117) 2011/01/13 Released by Harlan Stenn <stenn@ntp.org>
 * Add configure --without-sntp option to disable building sntp and
   sntp/tests.  withsntp=no in the environment changes the default.

diff --git a/configure.ac b/configure.ac
index ac7072116a63d90828019c697fe63fa0ff36ddc4..e3015c83ef8eac3212d281e414ab47e9ed816f6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1090,15 +1090,11 @@ esac])
 #
 # Check for if_nametoindex() for IPv6 scoped addresses support
 #
-AC_CHECK_FUNCS([if_nametoindex])
-case "$ac_cv_func_if_nametoindex" in
- no)
-    case "$host" in
-     *-hp-hpux*)
-       AC_CHECK_LIB([ipv6], [if_nametoindex],
-           [ac_cv_func_if_nametoindex=yes ; LIBS="-lipv6 $LIBS"])
-    esac
+case "$host" in
+ *-hp-hpux*)
+    AC_SEARCH_LIBS([if_nametoindex], [ipv6])
 esac
+AC_CHECK_FUNCS([if_nametoindex])
 case "$ac_cv_func_if_nametoindex" in
  yes)
        AC_DEFINE([ISC_PLATFORM_HAVEIFNAMETOINDEX], [1],