Minor autoconf cleanup and documentation update

diff --git a/INSTALL b/INSTALL
index 38784fe68df2e7958cabe0557ea3973e3dea97b7..a0b107efa49d9db6cfc7e3e357b25e92910b0c13 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -9,13 +9,23 @@ Default location for configuration file is /usr/local/etc/bird.conf and
 for control socket is /usr/local/var/run/bird.ctl . You can change that
 by --sysconfdir and --localstatedir configure options.
 
+To compile current development BIRD source code from Git repository, you
+also need Git (to download the source code) and Autoconf (to generate
+the configure script and associated files using 'autoreconf' tool):
+
+$ git clone git://git.nic.cz/bird.git
+$ cd bird
+$ autoreconf
+
+Then continue as in usual installation above.
+
 
 Requirements
 ============
 
 For compiling BIRD you need these programs and libraries:
 
- - GNU C Compiler
+ - GNU C Compiler (or LLVM Clang)
  - GNU Make
  - GNU Bison
  - GNU M4

diff --git a/configure.ac b/configure.ac
index 2180bcdf1e57b5141e23fe15fc8c31747c2009ca..ca8d769017331077fa4a4f9b391514071b94b5b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,25 +241,7 @@ case $sysdesc in
 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_C_BIGENDIAN(
   [AC_DEFINE([CPU_BIG_ENDIAN], [1], [Define to 1 if cpu is big endian])],

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 8773f4c41e86d10500d491ac2125e579453f8d59..561d4dea4b1776d437cc0c6a2637a8b406b6b106 100644 (file)
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -516,7 +516,7 @@ static inline void
 sockaddr_fill4(struct sockaddr_in *sa, ip_addr a, uint port)
 {
   memset(sa, 0, sizeof(struct sockaddr_in));
-#ifdef HAVE_SIN_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   sa->sin_len = sizeof(struct sockaddr_in);
 #endif
   sa->sin_family = AF_INET;