Merge branch 'master' into int-new

diff --cc configure.ac
index 52bca08554161548f5e6ca0a3a6ee3490f04508a,ca8d769017331077fa4a4f9b391514071b94b5b1..de612ec273aca32a5ba7b2306b57d1f007434dd9
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -218,28 -241,8 +218,11 @@@ case $sysdesc i
  esac
  
  AC_CHECK_HEADERS_ONCE([alloca.h syslog.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_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_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])],

diff --cc sysdep/unix/io.c
Simple merge