configure.ac:

  restore -dev version of HAS_ROUTING_SOCKET stuff after merging from
  -stable un-backporting of same

bk: 49fba800bpxjwg-g9Xjl4CNLyJeT3A

diff --git a/configure.ac b/configure.ac
index 449d67c933d654498e420d3ab72d0b4a59437444..f6e6e8a8b2748e90d92c242445b78deea214bf7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -784,8 +784,19 @@ AC_CACHE_CHECK([for struct rt_msghdr], ac_cv_struct_rt_msghdr,
        ac_cv_struct_rt_msghdr=no)
 ])
 
-if test $ac_cv_struct_rt_msghdr = yes; then
+AC_CACHE_CHECK([for struct rtattr], ac_cv_struct_rtattr,
+[AC_TRY_COMPILE([
+#include <linux/rtnetlink.h>],
+[struct rtattr p;],
+       ac_cv_struct_rtattr=yes,
+       ac_cv_struct_rtattr=no)
+])
+
+if test $ac_cv_struct_rt_msghdr = yes -o $ac_cv_struct_rtattr = yes; then
     AC_DEFINE(HAS_ROUTING_SOCKET, 1, [Do we have a routing socket (struct rt_msghdr)?])
+    if test $ac_cv_struct_rtattr = yes; then
+        AC_DEFINE(HAVE_RTNETLINK, 1, [Do we have Linux routing socket?])
+    fi
 fi
 
 AC_CACHE_CHECK(