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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/01/16 15:23:45

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

Log message:
        patch #6377

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.309&r2=1.310
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1346&r2=1.1347
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.14&r2=1.15

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -b -r1.309 -r1.310
--- config/configure.in 19 Dec 2007 19:58:36 -0000      1.309
+++ config/configure.in 16 Jan 2008 15:23:45 -0000      1.310
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.10.0
+REQUIRED_OCAML=3.10.1
 DOWNLOAD_OCAML_MAJOR=3.10
-DOWNLOAD_OCAML=3.10.0
+DOWNLOAD_OCAML=3.10.1
 
 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.1*|3.09.*|3.08.4*|3.08.3*) ;;
+    "$REQUIRED_OCAML"*|3.10.0*|3.09.*|3.08.4*|3.08.3*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -1486,14 +1486,14 @@
 
 echo -n " - Gnutella          "
 if test "$GNUTELLA" = "yes"; then
-  echo "enabled (warning: default hostcache URLs out-of-date)"
+  echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi
 
 echo -n " - Gnutella2         "
 if test "$GNUTELLA2" = "yes"; then
-  echo "enabled (warning: default hostcache URLs out-of-date)"
+  echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -b -r1.1346 -r1.1347
--- distrib/ChangeLog   15 Jan 2008 09:08:31 -0000      1.1346
+++ distrib/ChangeLog   16 Jan 2008 15:23:45 -0000      1.1347
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2008/01/16
+6377: Configure: Make Ocaml 3.10.1 the default compiler
+- Ocaml 3.10.1 fixes crashes in MLDonkeys eDonkey module when compiled with
+  Ocaml 3.10.0 on 64bit systems
+
 2008/01/15
 6373: Swarmer: Ignore received data when file is queued
 

Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- distrib/Install.txt 4 Oct 2007 00:05:57 -0000       1.14
+++ distrib/Install.txt 16 Jan 2008 15:23:45 -0000      1.15
@@ -63,17 +63,17 @@
 is compiled.
 
 ------------------------------------------------------------------------
-1) Installing required tools: Objective-Caml 3.10.0 and LablGTK
+1) Installing required tools: Objective-Caml 3.10.1 and LablGTK
 
- 1.1) Objective-Caml 3.10.0 (from http://caml.inria.fr/pub/distrib/ocaml-3.10)
+ 1.1) Objective-Caml 3.10.1 (from http://caml.inria.fr/pub/distrib/ocaml-3.10)
 
-    ~/tmp> wget http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10.0.tar.gz
-    ~/tmp> tar zxf ocaml-3.10.0.tar.gz
-    ~/tmp> cd ocaml-3.10.0
+    ~/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/ocaml-3.10.0> ./configure
-    ~/tmp/ocaml-3.10.0> make world.opt
-    ~/tmp/ocaml-3.10.0> make install
+    ~/tmp/ocaml-3.10.1> ./configure
+    ~/tmp/ocaml-3.10.1> make world.opt
+    ~/tmp/ocaml-3.10.1> make install
 
  1.2.1) LablGTK 1.2.7 for GTK1
       (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)