AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.52)
-RSYNC_VERSION=2.5.6cvs
+RSYNC_VERSION=2.6.0pre1
AC_SUBST(RSYNC_VERSION)
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
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
[ --with-included-popt use bundled popt library, not from system])
AC_ARG_WITH(rsync-path,
- [ --with-rsync-path=PATH set default --rsync-path to PATH (default: \"rsync\")],
+ [ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)],
[ RSYNC_PATH="$with_rsync_path" ],
[ RSYNC_PATH="rsync" ])
AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
AC_ARG_WITH(rsh,
- AC_HELP_STRING([--with-rsh=CMD], [set rsh command to CMD (default: \"remsh\" or \"rsh\")]))
+ AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))
AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [remote shell is remsh not rsh])
if test x"$with_rsh" != x
then
RSYNC_RSH="$with_rsh"
-elif test x"$HAVE_REMSH" = x1
-then
- RSYNC_RSH="remsh"
else
- RSYNC_RSH="rsh"
+ RSYNC_RSH="ssh"
fi
AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command])
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
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) ],
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])
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)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
+if test x"$with_rsh" = x; then
+ if test x"$HAVE_REMSH" = x1; then
+ rmsh1='remsh:'
+ rmsh2='=remsh'
+ else
+ rmsh1='rsh: '
+ rmsh2='=rsh '
+ fi
+ AC_MSG_RESULT()
+ AC_MSG_RESULT([ **********************************************************************])
+ AC_MSG_RESULT([ * As of v2.6.0, the default remote shell is ssh instead of rsh!! *])
+ AC_MSG_RESULT([ * To use previous default of $rmsh1 ./configure --with-rsh$rmsh2 *])
+ AC_MSG_RESULT([ **********************************************************************])
+fi
+
AC_MSG_RESULT()
AC_MSG_RESULT([ rsync ${RSYNC_VERSION} configuration successful])
AC_MSG_RESULT()
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff