Last of the cleanup before the patching starts.

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index 4bf4803..50668ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.52)
 
-RSYNC_VERSION=2.6.1cvs
+RSYNC_VERSION=2.6.1pre-1
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -388,13 +388,21 @@ else
        AC_LIBOBJ(lib/getnameinfo)
 fi
 
-
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
-               [ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
+               [ AC_DEFINE(HAVE_SOCKADDR_LEN, 1, [Do we have sockaddr.sa_len?]) ],
+               [],
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
+               [ AC_DEFINE(HAVE_SOCKADDR_IN_LEN, 1, [Do we have sockaddr_in.sin_len?]) ],
                [],
                [
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 ])
 
 AC_MSG_CHECKING(struct sockaddr_storage)
@@ -407,7 +415,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
        AC_MSG_RESULT(no))
 
 AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],
-               [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID) ],
+               [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ],
                [],
                [
 #include <sys/types.h>