Backport if_nametoindex() check for hpux

bk: 4e3108c8B24jE604vjT1r0Pa0yOeLQ

diff --git a/ChangeLog b/ChangeLog
index de9ae7a54f979685fa2595d20a6b78c9ab10dbeb..10325d05b2ca879215688aef44d65e6ebff9affe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 * [Bug 1975] libntp/mktime.c won't work with 64-bit time_t
 * [Bug 1978] [Bug 1134] fix in 4.2.6p4-RC1 doesn't build on older Linux.
 * Backport several fixes for Coverity warnings from ntp-dev.
+* Backport if_nametoindex() check for hpux.
 
 ---
 (4.2.6p4-RC1) 2011/07/10 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/configure.ac b/configure.ac
index 99b009183a7aac1b1cc52c5af1f6c75a6e0a762e..b2d6082bcd5568f9375e1ab95b5047edeae1ee1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1577,21 +1577,15 @@ 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],
            [ISC: do we have if_nametoindex()?])
-       ;;
 esac
 
 AC_SEARCH_LIBS([inet_ntop], [resolv], , , [-lsocket -lnsl])