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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/12/12 23:00:16

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #6689

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.317&r2=1.318
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1385&r2=1.1386

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -b -r1.317 -r1.318
--- config/configure.in 4 Aug 2008 19:39:12 -0000       1.317
+++ config/configure.in 12 Dec 2008 23:00:06 -0000      1.318
@@ -486,7 +486,7 @@
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
   case "$OCAMLVERSION" in
-    "$REQUIRED_OCAML"*|3.10.1*|3.10.0*|3.09.*|3.08.4*|3.08.3*) ;;
+    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -535,6 +535,9 @@
           $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-"$REQUIRED_OCAML".tar.gz
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
+          $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-"$REQUIRED_OCAML".tar.gz
+        fi
+        if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
           $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.08/ocaml-"$REQUIRED_OCAML".tar.gz
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1385
retrieving revision 1.1386
diff -u -b -r1.1385 -r1.1386
--- distrib/ChangeLog   1 Sep 2008 07:36:49 -0000       1.1385
+++ distrib/ChangeLog   12 Dec 2008 23:00:09 -0000      1.1386
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/12/13
+6689: Allow compilation with Ocaml 3.11.0
+
 2008/09/01
 6629: Mail: Move hostname from subject to body (eydaimon)
 Updated Mozilla protocol handler to version 2.5