Move the definition of the minimum version of cvs that we'll work with

into the configuration file.

2 files changed, 6 insertions, 6 deletions

diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm
index 68efbece59a4..705f7f4ca821 100755
--- a/CVSROOT/cfg.pm
+++ b/CVSROOT/cfg.pm
@@ -16,8 +16,8 @@ use strict;
 use vars qw(
 	$ADD_TO_LINE $CHECK_HEADERS $DEBUG $EXCLUDE_FILE $FILE_PREFIX
 	$IDHEADER $LAST_FILE $MAILADDRS $MAILBANNER $MAILCMD $MAIL_BRANCH_HDR
-	$MAIL_ON_DIR_CREATION $MAIL_TRANSFORM $PID $PROG_CVS $PROG_MV
-	$TMPDIR $UNEXPAND_RCSID %TEMPLATE_HEADERS @COMMIT_HOSTS
+	$MAIL_ON_DIR_CREATION $MAIL_TRANSFORM $MINCVSVERSION $PID $PROG_CVS
+	$PROG_MV $TMPDIR $UNEXPAND_RCSID %TEMPLATE_HEADERS @COMMIT_HOSTS
 );
 
 my $CVSROOT = $ENV{'CVSROOT'} || die "Can't determine \$CVSROOT!";
@@ -59,6 +59,9 @@ $PROG_MV =	'/bin/mv';		# mv(1)
 # (Empty if you don't want checks.)
 @COMMIT_HOSTS = ();
 
+# The minimum version of cvs that we will work with.
+$MINCVSVERSION = "1090900";  # 1.9.9p0
+
 
 ################
 ### logcheck ###
diff --git a/CVSROOT/commitcheck b/CVSROOT/commitcheck
index 412bf1567cfa..4ab7b73810ff 100755
--- a/CVSROOT/commitcheck
+++ b/CVSROOT/commitcheck
@@ -12,11 +12,8 @@
 use strict;
 use lib $ENV{CVSROOT};
 use CVSROOT::cfg;
-
-
 my $CVSROOT = $ENV{CVSROOT} || die "Can't determine CVSROOT (commitcheck)!\n";
 
-my $MINCVSVERSION = "1090900";	# 1.9.9p0
 
 # Check that the user is committing on the right machine.
 #
@@ -47,7 +44,7 @@ my $VERSTR = `/usr/bin/cvs -v`;
 $VERSTR =~ s/.*Concurrent\D*(\S*).*/$1/s;
 $VERSTR =~ s/\D+/./g;
 my $VERSION = sprintf "%d%02d%02d%02d\n", split /\./, $VERSTR;
-unless ( $VERSION && $VERSION >= $MINCVSVERSION ) {
+unless ($VERSION && $VERSION >= $cfg::MINCVSVERSION) {
 	print "The wrong version of CVS is installed (commitcheck)!\n";
 	exit 1;
 }