[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/28 18:44:47

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7518

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.344&r2=1.345
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1527&r2=1.1528

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -b -r1.344 -r1.345
--- config/configure.in 22 Jan 2011 09:25:13 -0000      1.344
+++ config/configure.in 28 Mar 2011 18:44:47 -0000      1.345
@@ -381,7 +381,7 @@
 
 AC_ARG_ENABLE(batch,         [  --enable-batch          reply YES to all 
queries in this script], [BATCH="$enableval"])
 AC_ARG_ENABLE(force-ocaml,   [  --enable-force-ocaml    force usage of 
self-compiled Ocaml], [FORCE_OCAML="$enableval"])
-AC_ARG_ENABLE(ocamlver,      [  --enable-ocamlver=VER   force usage of 
specific Ocaml version (3.10.1|CVS), ], [REQUIRED_OCAML="$enableval"])
+AC_ARG_ENABLE(ocamlver,      [  --enable-ocamlver=VER   force usage of 
specific Ocaml version (3.10.1|SVN), ], [REQUIRED_OCAML="$enableval"])
 AC_ARG_ENABLE(mingw,         [  --enable-mingw          forces compilation 
with MINGW on Cygwin], [FORCE_MINGW="$enableval"])
 AC_ARG_ENABLE(checks,        [  --enable-checks         force mldonkey to 
perform bound checks on array/string access], [CHECKBOUNDS="$enableval"])
 if test "$CHECKBOUNDS" = "yes"; then
@@ -491,7 +491,7 @@
 AC_PATH_PROG(CAMLP4, camlp4,"",[$LOCAL_DIR/bin:$PATH])
 
 BUILD_OCAML=no
-if [ test -z "$OCAMLC" ] || [ test -z "$CAMLP4" ] || [ test "$REQUIRED_OCAML" 
= "CVS" ]; then
+if [ test -z "$OCAMLC" ] || [ test -z "$CAMLP4" ] || [ test "$REQUIRED_OCAML" 
= "SVN" ]; then
    BUILD_OCAML=yes
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
@@ -523,7 +523,7 @@
   else  
     
   echo "********  Objective-Caml $REQUIRED_OCAML is required  *********" 1>&2;
-  if [ test "$WGET" = "" ] && [ test "$REQUIRED_OCAML" != "CVS" ]; then
+  if [ test "$WGET" = "" ] && [ test "$REQUIRED_OCAML" != "SVN" ]; then
     echo "********          wget is missing          *********" 1>&2;
     echo "********       cannot download Ocaml       *********" 1>&2;
     exit 1
@@ -535,13 +535,12 @@
   case "$i" in
    y* | Y*)
       cd $PATCH_DIR
-      if [ test "$REQUIRED_OCAML" = "CVS" ]; then
+      if [ test "$REQUIRED_OCAML" = "SVN" ]; then
         rm -rf $BUILD_DIR
         mkdir -p $BUILD_DIR
         cd $BUILD_DIR
-        cvs -d:pserver:anoncvs:""@camlcvs.inria.fr:/caml login
-        cvs -z3 -d:pserver:address@hidden:/caml co -P ocaml
-        cd ocaml
+        svn checkout http://caml.inria.fr/svn/ocaml/trunk
+        cd trunk
       else
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
           echo Downloading ...
@@ -588,8 +587,8 @@
         fi
       fi
       cd $BUILD_DIR
-      if [ test "$REQUIRED_OCAML" = "CVS" ]; then
-        rm -rf ocaml
+      if [ test "$REQUIRED_OCAML" = "SVN" ]; then
+        rm -rf trunk
       else
         rm -rf ocaml-"$REQUIRED_OCAML"
       fi
@@ -669,7 +668,7 @@
 case "$OCAMLVERSION" in
     3.10.1*|3.10.2*|3.1*) ;;
     *)
-      if [ test "$REQUIRED_OCAML" != "CVS" ]; then
+      if [ test "$REQUIRED_OCAML" != "SVN" ]; then
         echo "********  Version $REQUIRED_OCAML of Objective-Caml is required  
*********" 1>&2;
         echo "*******  Check http://caml.inria.fr/  ********" 1>&2;
         exit 1

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1527
retrieving revision 1.1528
diff -u -b -r1.1527 -r1.1528
--- distrib/ChangeLog   28 Mar 2011 18:19:22 -0000      1.1527
+++ distrib/ChangeLog   28 Mar 2011 18:44:47 -0000      1.1528
@@ -15,6 +15,8 @@
 =========
 
 2011/03/28
+7518: Configure: Ocaml VCS moved to SVN
+- replace --enable-ocamlver=CVS with --enable-ocamlver=SVN to compile SVN trunk
 7517: http: fix XSS in error handler (ygrek)
 7495: Fix compilation of Ocaml 3.11.* with recent binutils (ecc, glondu)