[Bug 1972] checking for struct rtattr fails.

bk: 4e2d7953a6HPTtE1Vq5Z6QJSKPgEQg

diff --git a/ChangeLog b/ChangeLog
index 1d115950b50350b0b305ce98d3322362bc8a06c1..a66aec65dec3836463d6b4751f10a530765be7b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 * [Bug 1608] Parse Refclock driver should honor trusttime.
 * [Bug 1961] html2man update: distribute ntp-wait.html.
 * [Bug 1970] UNLINK_EXPR_SLIST() causes crash if list is empty.
+* [Bug 1972] checking for struct rtattr fails.
 
 ---
 (4.2.6p4-RC1) 2011/07/10 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/configure.ac b/configure.ac
index 87382624ee28850e5b577ed11c5c3fdc7e11ef1c..c215bccfeabe3338f3c81a68380101ebc596ebbb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -942,27 +942,28 @@ AC_CACHE_CHECK(
 
 AC_CACHE_CHECK(
     [for struct rtattr],
-    [ntp_cv_struct_rtattr],
+    [ntp_cv_rtattr],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
            [[
                #include <stddef.h>
+               #include <sys/socket.h>
                #include <linux/rtnetlink.h>
            ]],
            [[
                struct rtattr p;
            ]]
        )],
-       [ntp_cv_struct_rtattr=yes],
-       [ntp_cv_struct_rtattr=no]
+       [ntp_cv_rtattr=yes],
+       [ntp_cv_rtattr=no]
     )]
 )
 
-case "$ntp_cv_struct_rt_msghdr$ntp_cv_struct_rtattr" in
+case "$ntp_cv_struct_rt_msghdr$ntp_cv_rtattr" in
  *yes*)
     AC_DEFINE([HAS_ROUTING_SOCKET], [1],
        [Do we have a routing socket (rt_msghdr or rtattr)?])
-    case "$ntp_cv_struct_rtattr" in
+    case "$ntp_cv_rtattr" in
      yes)
        AC_DEFINE([HAVE_RTNETLINK], [1],
            [Do we have Linux routing socket?])