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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/06/26 21:21:07

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

Log message:
        patch #6048

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.300&r2=1.301
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1289&r2=1.1290
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.12&r2=1.13

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- config/configure.in 3 Jun 2007 13:17:01 -0000       1.300
+++ config/configure.in 26 Jun 2007 21:21:06 -0000      1.301
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.09.3
-DOWNLOAD_OCAML_MAJOR=3.09
-DOWNLOAD_OCAML=3.09.3
+REQUIRED_OCAML=3.10.0
+DOWNLOAD_OCAML_MAJOR=3.10
+DOWNLOAD_OCAML=3.10.0
 
 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.09.0*|3.09.1*|3.09.2*|3.08.4*|3.08.3*|3.10.0*) ;;
+    "$REQUIRED_OCAML"*|3.09.*|3.08.4*|3.08.3*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -532,7 +532,7 @@
           $WGET 
http://caml.inria.fr/pub/distrib/ocaml-"$DOWNLOAD_OCAML_MAJOR"/ocaml-"$REQUIRED_OCAML".tar.gz
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
-          $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
+          $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.08/ocaml-"$REQUIRED_OCAML".tar.gz
@@ -643,7 +643,7 @@
         GUI=no
       fi
       ;;
-    "$REQUIRED_OCAML"*|3.09.0*|3.09.1*|3.09.2*|3.08.4*|3.08.3*|3.10.0*) ;;
+    "$REQUIRED_OCAML"*|3.09.*|3.08.4*|3.08.3*) ;;
     *)
       if [ test "$REQUIRED_OCAML" != "CVS" ]; then
         REBUILD_OCAML=yes

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -b -r1.1289 -r1.1290
--- distrib/ChangeLog   24 Jun 2007 18:41:54 -0000      1.1289
+++ distrib/ChangeLog   26 Jun 2007 21:21:07 -0000      1.1290
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2007/06/26
+6048: Make Ocaml 3.10.0 the default compiler
+- MLDonkey can still be compiled with Ocaml 3.08.3/4 & 3.09.*
+- if you need GTK1 oldgui you must use Ocaml < 3.10.0 to compile
+
 2007/06/24
 6044: BT: Limit max_bt_uploaders to max_upload_slots (pango)
 6043: Discover WAN IP

Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- distrib/Install.txt 27 May 2007 14:38:16 -0000      1.12
+++ distrib/Install.txt 26 Jun 2007 21:21:07 -0000      1.13
@@ -63,17 +63,17 @@
 is compiled.
 
 ------------------------------------------------------------------------
-1) Installing required tools: Objective-Caml 3.09.3 and LablGTK
+1) Installing required tools: Objective-Caml 3.10.0 and LablGTK
 
- 1.1) Objective-Caml 3.09.3 (from http://caml.inria.fr/pub/distrib/ocaml-3.09)
+ 1.1) Objective-Caml 3.10.0 (from http://caml.inria.fr/pub/distrib/ocaml-3.10)
 
-    ~/tmp> wget http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.3.tar.gz
-    ~/tmp> tar zxf ocaml-3.09.3.tar.gz
-    ~/tmp> cd ocaml-3.09.3
+    ~/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/ocaml-3.09.3> ./configure
-    ~/tmp/ocaml-3.09.3> make world.opt
-    ~/tmp/ocaml-3.09.3> make install
+    ~/tmp/ocaml-3.10.0> ./configure
+    ~/tmp/ocaml-3.10.0> make world.opt
+    ~/tmp/ocaml-3.10.0> make install
 
  1.2.1) LablGTK 1.2.7 for GTK1
       (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)
@@ -100,6 +100,7 @@
 
     To build GTK1 newgui: ./configure --enable-gui=newgui1
     To build GTK1 oldgui: ./configure --enable-gui=oldgui
+      - note: oldgui does not compile with Ocaml >= 3.10
     To build GTK2 GUI:    ./configure --enable-gui[=newgui2]
     lablgtk-1.2.7 and lablgtk-2.6.0 can both be installed at the same time.