New method of checking out and configuring gnulib - define which version we need to use, and remember which version we used

1 files changed, 25 insertions, 18 deletions

diff --git a/README-CVS b/README-CVS
index 618fb3ce..bc0471d2 100644
--- a/README-CVS
+++ b/README-CVS
@@ -5,30 +5,35 @@ checked out of CVS, rather than from a released source distribution.
  * CVS
  * A C compiler, linker and software development libraries (the standard
    C library)
- * GNU Autoconf version 2.57 or later (earlier versions *may* work)
- * GNU Automake version 1.7 or later (earlier versions *may* work)
+ * GNU Autoconf version 2.61 or later (earlier versions *may* work)
+ * GNU Automake version 1.9 or later (earlier versions *may* work)
  * GNU m4 version 1.4 or later
  * GNU gettext (unless you use configure --disable-nls)
 
-2. Obtain a copy of Gnulib
-
- To obtain a copy of the gnulib library, check it out via anonymous CVS
- from the GNU CVS server.   Make sure you check it out into a separate 
- directory, away from the findutils sources.
-
-    CVS_RSH=ssh
-    export CVS_RSH
-    cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/gnulib co gnulib
-
-3. Generate a gnulib installation within the fileutils source tree
+2. Generate a gnulib installation within the fileutils source tree
 
  Change your working directory to the findutils source directory (that 
  is, the directory containing this file).   Then run the following 
  command:-
 
-    sh import-gnulib.sh   <name of the directory containing gnulib>
+    sh import-gnulib.sh   
+
+ This command will use CVS to check out the version of gnulib which is
+ intended to work with the findutils source you already have, as
+ configured by the file import-gnulib.config.  The gnulib code itself
+ is left in the directory "gnulib-cvs".  The "gnulib" directory
+ contains just the gnulib files that findutils needs during the build
+ process.
 
-4. Generate the configure scripts and Makefile.in files.
+ If you want to build findutils with a different version of gnulib,
+ just edit import-gnulib.config to change the version and then re-run
+ import-gnulib.sh.  When specifying the version, you can specify
+ either the date or a CVS tag.  If making any kind of release, please
+ use a fully identifying version (rather than just, say, "HEAD").
+
+ The import-gnulib.sh script will also run Autoconf and Automake to
+ generate the "configure" script and "Makefile.in" files.  Should you 
+ need to do this manually, you can do it like this :-
 
     aclocal -I m4 -I gnulib/m4     && \
     autoheader			   && \
@@ -36,6 +41,8 @@ checked out of CVS, rather than from a released source distribution.
     automake --add-missing --copy
 
 
-5. Run "configure" and "make" in the normal way.  If you have GNU
-   libintl installed, you can just run "configure".  Otherwise, run
-   "configure --disable-nls".
+3. Run "configure" and "make" in the normal way.  
+
+ If you have GNU libintl installed, you can just run "configure".
+ Otherwise, run "configure --disable-nls".
+