This commit was generated by cvs2svn to compensate for changes in r128266,

which included commits to RCS files with non-trunk default branches.

1 files changed, 18 insertions, 5 deletions

diff --git a/contrib/cvs/config.h.in b/contrib/cvs/config.h.in
index 66910f0..775a775 100644
--- a/contrib/cvs/config.h.in
+++ b/contrib/cvs/config.h.in
@@ -41,10 +41,15 @@
 /* Define to enable encryption support. */
 #undef ENCRYPTION
 
+/* Define if this executable will be running on case insensitive file systems.
+   In the client case, this means that it will request that the server pretend
+   to be case insensitive if it isn't already. */
+#undef FILENAMES_CASE_INSENSITIVE
+
 /* When committing or importing files, you must enter a log message. Normally,
    you can do this either via the -m flag on the command line, the -F flag on
    the command line, or an editor will be started for you. If you like to use
-   logging templates (the rcsinfo file within the /CVSROOT directory),
+   logging templates (the rcsinfo file within the $CVSROOT/CVSROOT directory),
    you might want to force people to use the editor even if they specify a
    message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
    message to be appended to the temp file when the editor is started. */
@@ -83,7 +88,7 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if your system has a working `fnmatch' function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
 #undef HAVE_FNMATCH
 
 /* Define to 1 if you have the <fnmatch.h> header file. */
@@ -116,9 +121,6 @@
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define to 1 if you have the `getpassphrase' function. */
-#undef HAVE_GETPASSPHRASE
-
 /* Define if you have the getspnam function. */
 #undef HAVE_GETSPNAM
 
@@ -155,6 +157,12 @@
 /* Define to 1 if you have the `krb_get_err_text' function. */
 #undef HAVE_KRB_GET_ERR_TEXT
 
+/* Define to 1 if you have the `krb' library (-lkrb). */
+#undef HAVE_LIBKRB
+
+/* Define to 1 if you have the `krb4' library (-lkrb4). */
+#undef HAVE_LIBKRB4
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -470,6 +478,11 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
+/* We want to always use the GNULIB version of getpass which we have in lib,
+   so define getpass to something that won't conflict with any existing system
+   declarations. */
+#undef getpass
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t