From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 9 May 2017 15:37:38 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd1f355b7b24f354f7d57f127911b4fd98354b34;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

fd1f355b7b24f354f7d57f127911b4fd98354b34
diff --cc configure.ac
index 52bca0855,ca8d76901..de612ec27
--- a/configure.ac
+++ b/configure.ac
@@@ -218,28 -241,8 +218,11 @@@ case $sysdesc i
  esac
  
  AC_CHECK_HEADERS_ONCE([alloca.h syslog.h])
+ AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [#include <sys/socket.h>])
+ 
 +AC_CHECK_HEADER([linux/lwtunnel.h], [AC_DEFINE([HAVE_LWTUNNEL], [1], [Define to 1 if you have the <linux/lwtunnel.h> header file.])])
 +AC_CHECK_MEMBERS([struct rtvia.rtvia_family], [AC_DEFINE([HAVE_STRUCT_RTVIA], [1], [Define to 1 if you have rtvia structure.])],,[#include <linux/rtnetlink.h>])
 +
- AC_MSG_CHECKING(whether 'struct sockaddr' has sa_len)
- AC_COMPILE_IFELSE([
-   AC_LANG_PROGRAM(
-     [[
-       #include <sys/types.h>
-       #include <sys/socket.h>
-     ]],
-     [[
-       static struct sockaddr sa;
-       int i = sizeof(sa.sa_len);
-     ]]
-   )],
-   [
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(HAVE_SIN_LEN,,sin_len)
-   ],
-   [AC_MSG_RESULT(no)]
- )
- 
  AC_C_BIGENDIAN(
    [AC_DEFINE([CPU_BIG_ENDIAN], [1], [Define to 1 if cpu is big endian])],
    [AC_DEFINE([CPU_LITTLE_ENDIAN], [1], [Define to 1 if cpu is little endian])],