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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/04 21:39:10

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #4760

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.241&tr2=1.242&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.653&tr2=1.654&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.241 mldonkey/config/configure.in:1.242
--- mldonkey/config/configure.in:1.241  Wed Jan  4 21:38:08 2006
+++ mldonkey/config/configure.in        Wed Jan  4 21:39:09 2006
@@ -146,9 +146,9 @@
 if test ! -z "$SUB_VERSION3"; then
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
-REQUIRED_OCAML=3.09.0
+REQUIRED_OCAML=3.09.1
 DOWNLOAD_OCAML_MAJOR=3.09
-DOWNLOAD_OCAML=3.09.0
+DOWNLOAD_OCAML=3.09.1
 
 REQUIRED_LABLGTK=1.2.7
 
@@ -331,6 +331,7 @@
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
   case "$OCAMLVERSION" in
     "$REQUIRED_OCAML"*) ;;
+    3.09.0*) ;;
     3.08.4*) ;;
     3.08.3*) ;;
     *)
@@ -463,6 +464,7 @@
 REBUILD_OCAML=no
 case "$OCAMLVERSION" in
     "$REQUIRED_OCAML"*) ;;
+    3.09.0*) ;;
     3.08.4*) ;;
     3.08.3*) ;;
     *)
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.653 mldonkey/distrib/ChangeLog:1.654
--- mldonkey/distrib/ChangeLog:1.653    Wed Jan  4 21:38:08 2006
+++ mldonkey/distrib/ChangeLog  Wed Jan  4 21:39:09 2006
@@ -12,6 +12,9 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2006/01/04
+4760: Allow use of Ocaml 3.09.1
+      MLDonkey can now be compiled with Ocaml 3.08.3/4, 3.09.0/1
+      Default for MLDonkey-compiled Ocaml is now 3.09.1
 4759: Configure: Improve gcc check
 4757: Compile patches for MorphOS (Christian Rosentreter)
 4748: HTML: Allow rename of files with '#', '&' and '%',