[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur... [cvs1-11-x-
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur... [cvs1-11-x-branch] |
Date: |
Thu, 25 May 2006 15:11:19 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Derek Robert Price <address@hidden> 06/05/25 15:11:17
Modified files:
. : ChangeLog Makefile.in config.h.in configure
configure.in
Log message:
* configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.692.2.240&tr2=1.692.2.241&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/Makefile.in.diff?only_with_tag=cvs1-11-x-branch&tr1=1.88.4.14&tr2=1.88.4.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/config.h.in.diff?only_with_tag=cvs1-11-x-branch&tr1=1.71.4.11&tr2=1.71.4.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?only_with_tag=cvs1-11-x-branch&tr1=1.174.2.72&tr2=1.174.2.73&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.in.diff?only_with_tag=cvs1-11-x-branch&tr1=1.176.2.64&tr2=1.176.2.65&r1=text&r2=text
Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.692.2.240 ccvs/ChangeLog:1.692.2.241
--- ccvs/ChangeLog:1.692.2.240 Thu Apr 27 18:26:39 2006
+++ ccvs/ChangeLog Thu May 25 15:11:15 2006
@@ -1,3 +1,7 @@
+2006-05-25 Derek Price <address@hidden>
+
+ * configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h.
+
2006-04-27 Derek Price <address@hidden>
* acinclude.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX.
Index: ccvs/Makefile.in
diff -u ccvs/Makefile.in:1.88.4.14 ccvs/Makefile.in:1.88.4.15
--- ccvs/Makefile.in:1.88.4.14 Sat Sep 24 23:52:45 2005
+++ ccvs/Makefile.in Thu May 25 15:11:15 2006
@@ -180,6 +180,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+with_default_rsh = @with_default_rsh@
# Unix source subdirs, where we'll want to run lint and etags:
# This is a legacy variable from b4 Automake
Index: ccvs/config.h.in
diff -u ccvs/config.h.in:1.71.4.11 ccvs/config.h.in:1.71.4.12
--- ccvs/config.h.in:1.71.4.11 Wed Jun 9 13:57:58 2004
+++ ccvs/config.h.in Thu May 25 15:11:15 2006
@@ -402,6 +402,10 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* The default remote shell to use, if one does not specify the CVS_RSH
+ environment variable. */
+#undef RSH_DFLT
+
/* If you are working with a large remote repository and a 'cvs checkout' is
swamping your network and memory, define these to enable flow control. You
will end up with even less probability of a consistent checkout (see
Index: ccvs/configure
diff -u ccvs/configure:1.174.2.72 ccvs/configure:1.174.2.73
--- ccvs/configure:1.174.2.72 Thu Apr 27 18:26:39 2006
+++ ccvs/configure Thu May 25 15:11:15 2006
@@ -311,7 +311,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote
AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB YACC LN_S PERL CSH MKTEMP
SENDMAIL PR ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE
MAKE_TARGETS_IN_VPATH_FALSE LIBOBJS KRB4 includeopt EDITOR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote
AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB YACC LN_S PERL CSH MKTEMP
SENDMAIL PR ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE
MAKE_TARGETS_IN_VPATH_FALSE LIBOBJS KRB4 includeopt EDITOR with_default_rsh
LTLIBOBJS'
ac_subst_files='MKTEMP_SH_FUNCTION'
# Initialize some variables set by options.
@@ -911,6 +911,8 @@
--with-gssapi GSSAPI directory (default autoselects)
--with-editor The default text editor CVS should use for log
messages (default autoselects)
+ --with-rsh The default remote shell CVS will use for :ext:
+ transport (default rsh)
--with-tmpdir The temporary directory CVS should use as a default
(default autoselects)
--with-umask Set the umask CVS will use by default in the
@@ -12601,6 +12603,90 @@
+# What remote shell transport should our client cvs default to using?
+
+# Check whether --with-rsh or --without-rsh was given.
+if test "${with_rsh+set}" = set; then
+ withval="$with_rsh"
+
+else
+ with_rsh="rsh ssh"
+fi;
+
+if test no = "$with_rsh"; then
+ { echo "$as_me:$LINENO: WARNING: Failed to find usable remote shell. Using
'rsh'." >&5
+echo "$as_me: WARNING: Failed to find usable remote shell. Using 'rsh'." >&2;}
+ with_rsh=rsh
+elif test yes = "$with_rsh"; then
+ # Make --with-rsh mean the same thing as --with-rsh=rsh
+ with_rsh=rsh
+fi
+
+if echo $with_rsh |grep ^/ >/dev/null; then
+ # If $with_rsh is an absolute path, issue a warning if the executable
+ # doesn't exist or isn't usable, but then trust the user and use it
+ # regardless
+ with_default_rsh=$with_rsh
+ echo "$as_me:$LINENO: checking for a remote shell" >&5
+echo $ECHO_N "checking for a remote shell... $ECHO_C" >&6
+ if ! test -f $with_rsh \
+ || ! test -x $with_rsh; then
+ # warn the user that they may encounter problems
+ { echo "$as_me:$LINENO: WARNING: $with_rsh is not a path to an executable
file" >&5
+echo "$as_me: WARNING: $with_rsh is not a path to an executable file" >&2;}
+ fi
+else
+ # Search for a remote shell
+ for ac_prog in $with_rsh
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with
args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_with_default_rsh+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$with_default_rsh"; then
+ ac_cv_prog_with_default_rsh="$with_default_rsh" # Let the user override the
test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_with_default_rsh="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+with_default_rsh=$ac_cv_prog_with_default_rsh
+if test -n "$with_default_rsh"; then
+ echo "$as_me:$LINENO: result: $with_default_rsh" >&5
+echo "${ECHO_T}$with_default_rsh" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$with_default_rsh" && break
+done
+test -n "$with_default_rsh" || with_default_rsh=""rsh""
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define RSH_DFLT "$with_default_rsh"
+_ACEOF
+
+
+
# Check whether --with-tmpdir or --without-tmpdir was given.
if test "${with_tmpdir+set}" = set; then
@@ -13944,6 +14030,7 @@
s,@KRB4@,$KRB4,;t t
s,@includeopt@,$includeopt,;t t
s,@EDITOR@,$EDITOR,;t t
+s,@with_default_rsh@,$with_default_rsh,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@MKTEMP_SH_FUNCTION@/r $MKTEMP_SH_FUNCTION
s,@MKTEMP_SH_FUNCTION@,,;t t
Index: ccvs/configure.in
diff -u ccvs/configure.in:1.176.2.64 ccvs/configure.in:1.176.2.65
--- ccvs/configure.in:1.176.2.64 Wed Sep 28 04:52:09 2005
+++ ccvs/configure.in Thu May 25 15:11:17 2006
@@ -497,6 +497,54 @@
dnl end --with-editor
dnl
+dnl
+dnl begin --with-rsh
+dnl
+dnl Many sites no longer desire the use of "rsh" as the default
+dnl remote shell program. They typically favor "ssh" as the default
+
+# What remote shell transport should our client cvs default to using?
+AC_ARG_WITH(
+ [rsh],
+ AC_HELP_STRING(
+ [--with-rsh],
+ [The default remote shell CVS will use for :ext: transport
+ (default rsh)]), ,
+ [with_rsh="rsh ssh"])
+
+if test no = "$with_rsh"; then
+ AC_MSG_WARN([Failed to find usable remote shell. Using 'rsh'.])
+ with_rsh=rsh
+elif test yes = "$with_rsh"; then
+ # Make --with-rsh mean the same thing as --with-rsh=rsh
+ with_rsh=rsh
+fi
+
+if echo $with_rsh |grep ^/ >/dev/null; then
+ # If $with_rsh is an absolute path, issue a warning if the executable
+ # doesn't exist or isn't usable, but then trust the user and use it
+ # regardless
+ with_default_rsh=$with_rsh
+ AC_MSG_CHECKING([for a remote shell])
+ if ! test -f $with_rsh \
+ || ! test -x $with_rsh; then
+ # warn the user that they may encounter problems
+ AC_MSG_WARN([$with_rsh is not a path to an executable file])
+ fi
+else
+ # Search for a remote shell
+ AC_CHECK_PROGS([with_default_rsh], [$with_rsh], "rsh")
+fi
+
+AC_DEFINE_UNQUOTED(
+ [RSH_DFLT], ["$with_default_rsh"],
+ [The default remote shell to use, if one does not specify the
+ CVS_RSH environment variable.])
+dnl done with finding a default CVS_RSH value
+dnl
+dnl end --with-rsh
+dnl
+
dnl
dnl Find a temporary directory
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur... [cvs1-11-x-branch],
Derek Robert Price <=