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 68dac5a..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.6
+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])
@@ -627,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()