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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/06/24 08:01:01

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7797

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.353&r2=1.354
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1552&r2=1.1553

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -b -r1.353 -r1.354
--- config/configure.in 24 Jun 2012 07:59:40 -0000      1.353
+++ config/configure.in 24 Jun 2012 08:01:01 -0000      1.354
@@ -558,7 +558,7 @@
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
   case "$OCAMLVERSION" in
-    "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
+    "$REQUIRED_OCAML"*|4.*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -728,7 +728,7 @@
 
 # force usage of supported OCaml versions
 case "$OCAMLVERSION" in
-    3.10.1*|3.10.2*|3.1*) ;;
+    3.10.1*|3.10.2*|3.1*|4.*) ;;
     *)
       if [ test "$REQUIRED_OCAML" != "SVN" ]; then
         echo "********  Version $REQUIRED_OCAML of Objective-Caml is required  
*********" 1>&2;

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1552
retrieving revision 1.1553
diff -u -b -r1.1552 -r1.1553
--- distrib/ChangeLog   24 Jun 2012 07:59:40 -0000      1.1552
+++ distrib/ChangeLog   24 Jun 2012 08:01:01 -0000      1.1553
@@ -15,6 +15,7 @@
 =========
 
 2012/06/24
+7797: allow build with upcoming OCaml 4.00 (ygrek)
 7795: spelling fix, official language name is "OCaml" (ygrek)
 7796: configure: fix non-portable use of echo (ygrek)