Update options.h as per configure generated version

1 files changed, 8 insertions, 74 deletions

diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h
index 476d747..144980e 100644
--- a/gnu/usr.bin/cvs/cvs/options.h
+++ b/gnu/usr.bin/cvs/cvs/options.h
@@ -3,7 +3,7 @@
  * Copyright (c) 1989-1992, Brian Berliner
  * 
  * You may distribute under the terms of the GNU General Public License as
- * specified in the README file that comes with the CVS 1.4 kit.
+ * specified in the README file that comes with the CVS source distribution.
  * 
  * This file holds (most of) the configuration tweaks that can be made to
  * customize CVS for your site.  CVS comes configured for a typical SunOS 4.x
@@ -16,19 +16,6 @@
  */
 
 /*
- * CVS provides the most features when used in conjunction with the
- * Version-5 release of RCS.  Thus, it is the default.  This also
- * assumes that GNU diff Version-1.15 is being used as well -- you
- * will have to configure your RCS V5 release separately to make this
- * the case. If you do not have RCS V5 and GNU diff V1.15, comment out
- * this define. You should not try mixing and matching other
- * combinations of these tools.
- */
-#ifndef HAVE_RCS5
-#define	HAVE_RCS5
-#endif
-
-/*
  * For portability and heterogeneity reasons, CVS is shipped by
  * default using my own text-file version of the ndbm database library
  * in the src/myndbm.c file.  If you want better performance and are
@@ -40,23 +27,6 @@
 #endif
 
 /*
- * The "diff" program to execute when creating patch output.  This
- * "diff" must support the "-c" option for context diffing.  Specify a
- * full pathname if your site wants to use a particular diff.  Note
- * that unlike the diff used with RCS, you *must not* supply -a here
- * (doing so will cause the server to generate patches which patch
- * cannot handle in some cases).
- * 
- * NOTE: this program is only used for the ``patch'' sub-command (and
- * for ``update'' if you are using the server).  The other commands
- * use rcsdiff which will use whatever version of diff was specified
- * when rcsdiff was built on your system.
- */
-#ifndef DIFF
-#define	DIFF	"diff"
-#endif
-
-/*
  * The "patch" program to run when using the CVS server and accepting
  * patches across the network.  Specify a full pathname if your site
  * wants to use a particular patch.
@@ -65,41 +35,6 @@
 #define PATCH_PROGRAM	"patch"
 #endif
 
-/*
- * By default, RCS programs are executed with the shell or through
- * execlp(), so the user's PATH environment variable is searched.  If
- * you'd like to bind all RCS programs to a certain directory (perhaps
- * one not in most people's PATH) then set the default in RCSBIN_DFLT.
- * Note that setting this here will cause all RCS programs to be
- * executed from this directory, unless the user overrides the default
- * with the RCSBIN environment variable or the "-b" option to CVS.
- * 
- * If you use the password-authenticating server, then you need to
- * make sure that the server can find the RCS programs to invoke them.
- * The authenticating server starts out running as root, and then
- * switches to run as the appropriate user once authentication is
- * complete.  But no actual shell is ever started by that user, so the
- * PATH environment variable may not contain the directory with the
- * RCS binaries, even though if that user logged in normally, PATH
- * would include the directory.
- *
- * One way to solve this problem is to set RCSBIN_DFLT here.  An
- * alternative is to make sure that root has the right directory in
- * its path already.  Another, probably better alternative is to
- * specify -b in /etc/inetd.conf.
- *
- * You may also have to set RCSBIN_DFLT here if there's no global
- * start-up script run for users by rshd and your RCS programs are not
- * in a directory in the default PATH assigned by rshd.
- *
- * This define should be either the empty string ("") or a full
- * pathname to the directory containing all the installed programs
- * from the RCS distribution.
- */
-#ifndef RCSBIN_DFLT
-#define	RCSBIN_DFLT	""
-#endif
-
 /* Directory used for storing temporary files, if not overridden by
    environment variables or the -T global option.  There should be little
    need to change this (-T is a better mechanism if you need to use a
@@ -149,10 +84,14 @@
  * working directory.  This path is either a full-path or a path
  * relative to CVSROOT.
  * 
- * The only advantage that I can see to having a relative path is that
+ * The big advantage that I can see to having a relative path is that
  * one can change the physical location of the master source
- * repository, change one's CVSROOT environment variable, and CVS will
- * work without problems.  I recommend using full-paths.
+ * repository, change the contents of CVS/Root files in your
+ * checked-out code, and CVS will work without problems.
+ *
+ * This is likely to be the default in the future, but we want to give
+ * people who may be relying on absolute pathnames time to update
+ * their scripts/software.
  */
 #ifndef RELATIVE_REPOS
 /* #define	RELATIVE_REPOS	 */
@@ -261,8 +200,3 @@
 #ifndef STDC_HEADERS
 extern void exit ();
 #endif
-
-#ifndef getwd
-extern char *getwd ();
-#endif
-