Added RERR_VANISHED.

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index a597687..ff4bf74 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.5.6cvs
+RSYNC_VERSION=2.5.7
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -25,7 +25,7 @@ AC_SUBST(SHELL)
 AC_DEFINE([_GNU_SOURCE], 1,
           [Define _GNU_SOURCE so that we get all necessary prototypes])
 
-if test "$xac_cv_prog_cc_stdc" = xno
+if test "x$ac_cv_prog_cc_stdc" = xno
 then
        AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one])
 fi
@@ -247,6 +247,15 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
 fi
 
+AC_MSG_CHECKING([whether to call shutdown on all sockets])
+case $host_os in
+       *cygwin* ) AC_MSG_RESULT(yes)
+                   AC_DEFINE(SHUTDOWN_ALL_SOCKETS, 1, 
+                           [Define if sockets need to be shutdown])
+                  ;;
+              * ) AC_MSG_RESULT(no);;
+esac
+
 AC_C_BIGENDIAN
 AC_HEADER_DIRENT
 AC_HEADER_TIME
@@ -327,20 +336,39 @@ dnl AC_MSG_NOTICE([Looking in libraries: $LIBS])
 AC_CHECK_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) 
 AC_CHECK_FUNCS(inet_pton, , AC_LIBOBJ(lib/inet_pton))
 
-# Tru64 UNIX has getaddrinfo() but has it renamed in libc as
-# something else so we must include <netdb.h> to get the
-# redefinition.
-AC_CHECK_FUNCS(getaddrinfo, ,
-       [AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
-       AC_TRY_LINK([#include <sys/types.h>
-       #include <sys/socket.h>
-       #include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
-               [AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_GETADDRINFO, 1,
-                       [Define if you have the `getaddrinfo' function.])],
-               [AC_MSG_RESULT([no])
-               AC_LIBOBJ(lib/getaddrinfo)])])
-AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
+# Irix 6.5 has getaddrinfo but not the corresponding defines, so use
+#   builtin getaddrinfo if one of the defines don't exist
+AC_CACHE_CHECK([whether defines needed by getaddrinfo exist],
+               rsync_cv_HAVE_GETADDR_DEFINES,[
+                       AC_EGREP_CPP(yes, [
+                       #include <sys/types.h>
+                       #include <sys/socket.h>
+                       #include <netdb.h>
+                       #ifdef AI_PASSIVE
+                       yes
+                       #endif], 
+                       rsync_cv_HAVE_GETADDR_DEFINES=yes,
+                       rsync_cv_HAVE_GETADDR_DEFINES=no)])
+if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then
+       # Tru64 UNIX has getaddrinfo() but has it renamed in libc as
+       # something else so we must include <netdb.h> to get the
+       # redefinition.
+       AC_CHECK_FUNCS(getaddrinfo, ,
+               [AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
+               AC_TRY_LINK([#include <sys/types.h>
+               #include <sys/socket.h>
+               #include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
+                       [AC_MSG_RESULT([yes])
+                       AC_DEFINE(HAVE_GETADDRINFO, 1,
+                               [Define if you have the `getaddrinfo' function.])],
+                       [AC_MSG_RESULT([no])
+                       AC_LIBOBJ(lib/getaddrinfo)])])
+       AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
+else
+       AC_LIBOBJ(lib/getaddrinfo)
+       AC_LIBOBJ(lib/getnameinfo)
+fi
+
 
 AC_CHECK_MEMBER([struct sockaddr.sa_len], 
                [ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
@@ -401,15 +429,6 @@ if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
     AC_DEFINE(HAVE_SOCKETPAIR, 1, [ ])
 fi
 
-AC_CACHE_CHECK([for working fnmatch],rsync_cv_HAVE_FNMATCH,[
-AC_TRY_RUN([#include <fnmatch.h>
-main() { exit((fnmatch("*.o", "x.o", FNM_PATHNAME) == 0 &&
-               fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME) != 0) ? 0: 1); }],
-rsync_cv_HAVE_FNMATCH=yes,rsync_cv_HAVE_FNMATCH=no,rsync_cv_HAVE_FNMATCH=cross)])
-if test x"$rsync_cv_HAVE_FNMATCH" = x"yes"; then
-    AC_DEFINE(HAVE_FNMATCH, 1, [ ])
-fi
-
 if test x"$with_included_popt" != x"yes"
 then
     AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
@@ -421,11 +440,11 @@ then
     AC_MSG_RESULT($srcdir/popt)
     BUILD_POPT='$(popt_OBJS)'
     CFLAGS="$CFLAGS -I$srcdir/popt"
-    if test -n "$ALLOCA"
+    if test x"$ALLOCA" != x
     then
-       # this can be removed when/if we add an included alloca.c; see
-       #  autoconf documentation on AC_FUNC_ALLOCA
-       AC_MSG_ERROR([included libpopt requires alloca which is not available])
+       # this can be removed when/if we add an included alloca.c;
+       #  see autoconf documentation on AC_FUNC_ALLOCA
+       AC_MSG_WARN([included libpopt will use malloc, not alloca (which wastes a small amount of memory)])
     fi
 else
     AC_MSG_RESULT(no)