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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/02/29 19:24:45

Modified files:
        config         : configure.in 
        distrib        : ChangeLog Install.txt 

Log message:
        patch #6439

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.312&r2=1.313
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1359&r2=1.1360
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.15&r2=1.16

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -b -r1.312 -r1.313
--- config/configure.in 3 Feb 2008 23:06:30 -0000       1.312
+++ config/configure.in 29 Feb 2008 19:24:44 -0000      1.313
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.10.1
+REQUIRED_OCAML=3.10.2
 DOWNLOAD_OCAML_MAJOR=3.10
-DOWNLOAD_OCAML=3.10.1
+DOWNLOAD_OCAML=3.10.2
 
 REQUIRED_LABLGTK=1.2.7
 
@@ -486,7 +486,7 @@
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
   case "$OCAMLVERSION" in
-    "$REQUIRED_OCAML"*|3.10.0*|3.09.*|3.08.4*|3.08.3*) ;;
+    "$REQUIRED_OCAML"*|3.10.1*|3.10.0*|3.09.*|3.08.4*|3.08.3*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1359
retrieving revision 1.1360
diff -u -b -r1.1359 -r1.1360
--- distrib/ChangeLog   6 Feb 2008 20:39:53 -0000       1.1359
+++ distrib/ChangeLog   29 Feb 2008 19:24:44 -0000      1.1360
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/02/29
+6439: Configure: Make Ocaml 3.10.2 the default compiler
+
 2008/02/06
 6407: New options run_as_group/run_as_groupgid
 - works the same way as options run_as_user/run_as_useruid

Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- distrib/Install.txt 16 Jan 2008 15:23:45 -0000      1.15
+++ distrib/Install.txt 29 Feb 2008 19:24:45 -0000      1.16
@@ -63,17 +63,17 @@
 is compiled.
 
 ------------------------------------------------------------------------
-1) Installing required tools: Objective-Caml 3.10.1 and LablGTK
+1) Installing required tools: Objective-Caml 3.10.2 and LablGTK
 
- 1.1) Objective-Caml 3.10.1 (from http://caml.inria.fr/pub/distrib/ocaml-3.10)
+ 1.1) Objective-Caml 3.10.2 (from http://caml.inria.fr/pub/distrib/ocaml-3.10)
 
-    ~/tmp> wget http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10.1.tar.gz
-    ~/tmp> tar zxf ocaml-3.10.1.tar.gz
-    ~/tmp> cd ocaml-3.10.1
+    ~/tmp> wget http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10.2.tar.gz
+    ~/tmp> tar zxf ocaml-3.10.2.tar.gz
+    ~/tmp> cd ocaml-3.10.2
 
-    ~/tmp/ocaml-3.10.1> ./configure
-    ~/tmp/ocaml-3.10.1> make world.opt
-    ~/tmp/ocaml-3.10.1> make install
+    ~/tmp/ocaml-3.10.2> ./configure
+    ~/tmp/ocaml-3.10.2> make world.opt
+    ~/tmp/ocaml-3.10.2> make install
 
  1.2.1) LablGTK 1.2.7 for GTK1
       (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)