Checkout gnulib using 'git' instead of 'cvs'.

diff --git a/ChangeLog b/ChangeLog
index 1c4d917d6941535fb6d8df0b08007838c876c837..72c2dac5aa5e298c2b427aab15a8fac676c4d867 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-14  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Checkout gnulib using 'git' instead of 'cvs'.
+
 2009-01-14  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: More consistent m4 quoting.

diff --git a/autogen.sh b/autogen.sh
index b94b36979527ddc9d8d73e9cf01ae74803286178..0354f7e40301f5c88fdd23fe07440f0a3ba14f22 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,9 +8,9 @@
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or
-#   - the cvs program in the PATH and an internet connection.
+#   - the git program in the PATH and an internet connection.
 
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -56,12 +56,10 @@ chmod a+x gettext-tools/tests/msgmerge-update-4
 if ! $skip_gnulib; then
   if test -z "$GNULIB_TOOL"; then
     # Check out gnulib in a subdirectory 'gnulib'.
-    GNULIB_CVS_ROOT=':pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git'
-    GNULIB_CVS_REPOSITORY='gnulib'
     if test -d gnulib; then
-      (cd gnulib && cvs update -d -P)
+      (cd gnulib && git pull)
     else
-      cvs -d "$GNULIB_CVS_ROOT" checkout -d $GNULIB_CVS_REPOSITORY HEAD
+      git clone git://git.savannah.gnu.org/gnulib.git
     fi
     # Now it should contain a gnulib-tool.
     if test -f gnulib/gnulib-tool; then