Output a warning about the new remote-shell default if the --with-rsh

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index d0002c1..45a5f36 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.6pre3cvs
+RSYNC_VERSION=2.6.0pre1
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -90,14 +90,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 +105,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])
@@ -247,15 +244,6 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
 fi
 
-AC_MSG_CHECKING([default value for --modify-window])
-case $host_os in
-       *cygwin* ) DEFAULT_MODIFY_WINDOW=${DEFAULT_MODIFY_WINDOW:-1};;
-              * ) DEFAULT_MODIFY_WINDOW=${DEFAULT_MODIFY_WINDOW:-0};;
-esac
-AC_MSG_RESULT($DEFAULT_MODIFY_WINDOW)
-AC_DEFINE_UNQUOTED(DEFAULT_MODIFY_WINDOW, $DEFAULT_MODIFY_WINDOW,
-       [Set to the default value for the --modify-window option])
-
 AC_MSG_CHECKING([whether to call shutdown on all sockets])
 case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
@@ -265,15 +253,6 @@ case $host_os in
               * ) AC_MSG_RESULT(no);;
 esac
 
-AC_MSG_CHECKING([whether generator should delay before signaling receiver])
-case $host_os in
-       *cygwin* ) AC_MSG_RESULT(yes)
-                   AC_DEFINE(DELAY_BEFORE_SIGNALING_RECEIVER, 1, 
-                           [Define if generator should delay before signaling receiver])
-                  ;;
-              * ) AC_MSG_RESULT(no);;
-esac
-
 AC_C_BIGENDIAN
 AC_HEADER_DIRENT
 AC_HEADER_TIME
@@ -447,15 +426,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])
@@ -654,6 +624,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()