X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7ab153886163714065519275c275200a3cbca230..bbfb1d016b1dfe742d4396d89b66aa513eca9589:/configure.in diff --git a/configure.in b/configure.in index 59cb99d1..af0f2ea0 100644 --- 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.6pre2cvs +RSYNC_VERSION=2.6.0 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -18,6 +18,7 @@ AC_CANONICAL_TARGET([]) dnl Checks for programs. AC_PROG_CC AC_PROG_CPP +AC_PROG_EGREP AC_PROG_INSTALL AC_PROG_CC_STDC AC_SUBST(SHELL) @@ -90,14 +91,14 @@ AC_ARG_WITH(included-popt, [ --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]) @@ -105,11 +106,8 @@ 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]) @@ -124,7 +122,7 @@ AC_TRY_RUN([ #include #include -int main(void) +int main(void) { struct flock lock; int status; @@ -154,7 +152,7 @@ ipv6type=unknown ipv6lib=none ipv6trylibc=yes -AC_ARG_ENABLE(ipv6, +AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) if test "x$enable_ipv6" != xno @@ -180,7 +178,7 @@ yes #ifdef __KAME__ yes #endif], - [ipv6type=$i; + [ipv6type=$i; AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; linux-glibc) @@ -247,6 +245,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 @@ -312,7 +319,7 @@ if test x"$ac_cv_func_connect" = x"no"; then esac dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value dnl has been cached. - if test x"$ac_cv_lib_socket_connect" = x"yes" || + if test x"$ac_cv_lib_socket_connect" = x"yes" || test x"$ac_cv_lib_inet_connect" = x"yes"; then # ac_cv_func_connect=yes # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run @@ -324,25 +331,44 @@ AC_CHECK_LIB(resolv, inet_ntop) 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 to get the -# redefinition. -AC_CHECK_FUNCS(getaddrinfo, , - [AC_MSG_CHECKING([for getaddrinfo by including ]) - AC_TRY_LINK([#include - #include - #include ],[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)) - -AC_CHECK_MEMBER([struct sockaddr.sa_len], +AC_CHECK_FUNCS(inet_ntop, , [AC_LIBOBJ(lib/inet_ntop)]) +AC_CHECK_FUNCS(inet_pton, , [AC_LIBOBJ(lib/inet_pton)]) + +# 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 + #include + #include + #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 to get the + # redefinition. + AC_CHECK_FUNCS(getaddrinfo, , + [AC_MSG_CHECKING([for getaddrinfo by including ]) + AC_TRY_LINK([#include + #include + #include ],[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) ], [], [ @@ -355,7 +381,7 @@ AC_TRY_COMPILE([#include #include ], [struct sockaddr_storage x;], AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Define if you have strct sockaddr_storage.] ), AC_MSG_RESULT(no)) @@ -377,7 +403,7 @@ fi dnl At the moment we don't test for a broken memcmp(), because all we dnl need to do is test for equality, not comparison, and it seems that -dnl every platform has a memcmp that can do at least that. +dnl every platform has a memcmp that can do at least that. dnl AC_FUNC_MEMCMP AC_FUNC_UTIME_NULL @@ -401,15 +427,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 -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]) @@ -500,7 +517,7 @@ AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[ AC_TRY_RUN([ #include #include -void foo(const char *format, ...) { +void foo(const char *format, ...) { va_list ap; int len; char buf[5]; @@ -527,10 +544,10 @@ AC_TRY_RUN([#include #include #include #include -main() { +main() { struct stat st; - char tpl[20]="/tmp/test.XXXXXX"; - int fd = mkstemp(tpl); + char tpl[20]="/tmp/test.XXXXXX"; + int fd = mkstemp(tpl); if (fd == -1) exit(1); unlink(tpl); if (fstat(fd, &st) != 0) exit(1); @@ -553,7 +570,7 @@ AC_TRY_RUN([ #include main() { struct in_addr ip; ip.s_addr = 0x12345678; if (strcmp(inet_ntoa(ip),"18.52.86.120") && - strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } exit(0);}], rsync_cv_REPLACE_INET_NTOA=no,rsync_cv_REPLACE_INET_NTOA=yes,rsync_cv_REPLACE_INET_NTOA=cross)]) if test x"$rsync_cv_REPLACE_INET_NTOA" = x"yes"; then @@ -567,7 +584,7 @@ AC_TRY_RUN([ #include #include #include -main() { struct in_addr ip; +main() { struct in_addr ip; if (inet_aton("example", &ip) == 0) exit(0); exit(1);}], rsync_cv_REPLACE_INET_ATON=no,rsync_cv_REPLACE_INET_ATON=yes,rsync_cv_REPLACE_INET_ATON=cross)]) if test x"$rsync_cv_REPLACE_INET_ATON" = x"yes"; then @@ -608,6 +625,21 @@ AC_SUBST(BUILD_POPT) 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()