Remove highly suspicious redefinition of sockaddr structure -- there

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index f28eb9c..421c2df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_SUBST(SHELL)
 
-RSYNC_VERSION=2.4.7pre2
+RSYNC_VERSION=2.4.7pre3
 AC_SUBST(RSYNC_VERSION)
 AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
 
@@ -92,20 +92,20 @@ fi
 
 
 
-AC_DEFINE(ss_family, __ss_family, [KAME hack])
-AC_DEFINE(ss_len, __ss_len, [KAME hack])
+dnl AC_DEFINE(ss_family, __ss_family, [KAME hack])
+dnl AC_DEFINE(ss_len, __ss_len, [KAME hack])
 
 CFLAGS="$CFLAGS"
 AC_ARG_ENABLE(ipv6,
-       AC_HELP_STRING([--disable-ipv6], [do not try to support IPv6]))
-AC_MSG_CHECKING([whether IPv6 is explicitly disabled])
+       AC_HELP_STRING([--enable-ipv6], [try to support IPv6]))
+AC_MSG_CHECKING([whether IPv6 is requested])
 if test "$xenable_ipv6" = xyes
 then
        AC_MSG_RESULT(yes)
-       ipv6=no
+       ipv6=yes
 else
        AC_MSG_RESULT(no)
-       ipv6=yes
+       ipv6=no
 fi
 
 ipv6type=unknown
@@ -214,125 +214,16 @@ fi
 if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
        if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
                LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-               echo "You have $ipv6lib library, using it"
+               AC_MSG_NOTICE([You have $ipv6lib library, using it])
        else
                if test "$ipv6trylibc" = "yes"; then
-                       echo "You do not have $ipv6lib library, using libc"
+                       AC_MSG_WARN([You do not have $ipv6lib library, using libc])
                else
-                       echo 'Fatal: no $ipv6lib library found.  cannot continue.'
-                       echo "You need to fetch lib$ipv6lib.a from appropriate"
-                       echo 'ipv6 kit and compile beforehand.'
-                       exit 1
+                       AC_MSG_ERROR([No $ipv6lib library found.  cannot continue.  You need to fetch lib$ipv6lib.a from appropriate ipv6 kit and compile beforehand.])
                fi
        fi
 fi
 
-
-AC_MSG_CHECKING(getaddrinfo bug)
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-main()
-{
-  int passive, gaierr, inet4 = 0, inet6 = 0;
-  struct addrinfo hints, *ai, *aitop;
-  char straddr[INET6_ADDRSTRLEN], strport[16];
-
-  for (passive = 0; passive <= 1; passive++) {
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_flags = passive ? AI_PASSIVE : 0;
-    hints.ai_socktype = SOCK_STREAM;
-    if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
-      (void)gai_strerror(gaierr);
-      goto bad;
-    }
-    for (ai = aitop; ai; ai = ai->ai_next) {
-      if (ai->ai_addr == NULL ||
-          ai->ai_addrlen == 0 ||
-          getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                      straddr, sizeof(straddr), strport, sizeof(strport),
-                      NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-        goto bad;
-      }
-      switch (ai->ai_family) {
-      case AF_INET:
-        if (strcmp(strport, "54321") != 0) {
-          goto bad;
-        }
-        if (passive) {
-          if (strcmp(straddr, "0.0.0.0") != 0) {
-            goto bad;
-          }
-        } else {
-          if (strcmp(straddr, "127.0.0.1") != 0) {
-            goto bad;
-          }
-        }
-        inet4++;
-        break;
-      case AF_INET6:
-        if (strcmp(strport, "54321") != 0) {
-          goto bad;
-        }
-        if (passive) {
-          if (strcmp(straddr, "::") != 0) {
-            goto bad;
-          }
-        } else {
-          if (strcmp(straddr, "::1") != 0) {
-            goto bad;
-          }
-        }
-        inet6++;
-        break;
-      case AF_UNSPEC:
-        goto bad;
-        break;
-      default:
-        /* another family support? */
-        break;
-      }
-    }
-  }
-
-  if (!(inet4 == 0 || inet4 == 2))
-    goto bad;
-  if (!(inet6 == 0 || inet6 == 2))
-    goto bad;
-
-  if (aitop)
-    freeaddrinfo(aitop);
-  exit(0);
-
- bad:
-  if (aitop)
-    freeaddrinfo(aitop);
-  exit(1);
-}
-],
-AC_MSG_RESULT(good)
-buggygetaddrinfo=no,
-AC_MSG_RESULT(buggy)
-buggygetaddrinfo=yes,
-AC_MSG_RESULT(buggy)
-buggygetaddrinfo=yes)
-
-if test "$buggygetaddrinfo" = "yes"; then
-       if test "$ipv6" = "yes" -a "$ipv6type" != "linux"; then
-               echo 'Fatal: You must get working getaddrinfo() function.'
-               echo '       or you can specify "--disable-ipv6"'.
-               exit 1
-       elif test "$ipv6type" = "linux"; then
-               echo 'Warning: getaddrinfo() implementation on your system seems be buggy.'
-               echo '         Better upgreade your system library to newest version'
-               echo '         of GNU C library (aka glibc).'
-       fi
-fi
 AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
 
 AC_CHECK_MEMBER([struct sockaddr.sa_len], 
@@ -350,7 +241,8 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h)
 AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h)
 AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h)
-AC_CHECK_HEADERS(glob.h alloca.h mcheck.h)
+AC_CHECK_HEADERS(glob.h alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h)
+AC_CHECK_HEADERS(netdb.h)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)