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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/03/20 13:32:44

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7127

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.323&r2=1.324
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1406&r2=1.1407

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -b -r1.323 -r1.324
--- config/configure.in 20 Mar 2010 13:30:37 -0000      1.323
+++ config/configure.in 20 Mar 2010 13:32:44 -0000      1.324
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.11.1
+REQUIRED_OCAML=3.11.2
 DOWNLOAD_OCAML_MAJOR=3.11
-DOWNLOAD_OCAML=3.11.1
+DOWNLOAD_OCAML=3.11.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.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+    "$REQUIRED_OCAML"*|3.11.*|3.10.*|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.1406
retrieving revision 1.1407
diff -u -b -r1.1406 -r1.1407
--- distrib/ChangeLog   20 Mar 2010 13:30:39 -0000      1.1406
+++ distrib/ChangeLog   20 Mar 2010 13:32:44 -0000      1.1407
@@ -15,6 +15,7 @@
 =========
 
 2010/03/20
+7127: Configure: Use Ocaml 3.11.2 as default compiler
 7076: Support preallocating files on Unix systems (drwho)
       Recent Linux kernels support fast preallocation when the filesystem is
       XFS, EXT4 or BTRFS, this patch adds preallocation support when