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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/03 15:23:08

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 
        src/daemon/common: commonFile.mli 
        src/utils/lib  : autoconf.ml.new.in 

Log message:
        patch #5439

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1038&r2=1.1039
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.mli?cvsroot=mldonkey&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/autoconf.ml.new.in?cvsroot=mldonkey&r1=1.25&r2=1.26

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- config/configure.in 17 Sep 2006 18:42:57 -0000      1.283
+++ config/configure.in 3 Oct 2006 15:23:08 -0000       1.284
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.09.2
+REQUIRED_OCAML=3.09.3
 DOWNLOAD_OCAML_MAJOR=3.09
-DOWNLOAD_OCAML=3.09.2
+DOWNLOAD_OCAML=3.09.3
 
 REQUIRED_LABLGTK=1.2.7
 
@@ -487,7 +487,7 @@
     "$REQUIRED_OCAML"*) ;;
     3.09.0*) ;;
     3.09.1*) ;;
-    3.09.3*) ;;
+    3.09.2*) ;;
     3.08.4*) ;;
     3.08.3*) ;;
     *)
@@ -640,7 +640,7 @@
     "$REQUIRED_OCAML"*) ;;
     3.09.0*) ;;
     3.09.1*) ;;
-    3.09.3*) ;;
+    3.09.2*) ;;
     3.08.4*) ;;
     3.08.3*) ;;
     *)
@@ -1330,11 +1330,6 @@
   echo "---------------------------------------------------------"
 fi
 
-case "$OCAMLVERSION" in
-  3.06* | 3.07* | 3.08* ) TYPE_FORMAT="";;
-  *) TYPE_FORMAT="type ('a,'b,'c) ml_format = ('a,'b, 'c,'c) format4  type 
('a,'b,'c) format = ('a,'b, 'c) ml_format";;
-esac
-
 if test "$OS_FILES" = "mingw"; then
    OCAMLDEP_OPTIONS="-slash"
 fi
@@ -1351,7 +1346,6 @@
 AC_SUBST(CXX)
 AC_SUBST(FIX_BROKEN_CPP)
 AC_SUBST(CONFIG_INCLUDES)
-AC_SUBST(TYPE_FORMAT)
 AC_SUBST(OCAMLC)
 AC_SUBST(OCAMLLIB)
 AC_SUBST(OCAMLOPT)

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1038
retrieving revision 1.1039
diff -u -b -r1.1038 -r1.1039
--- distrib/ChangeLog   2 Oct 2006 12:56:53 -0000       1.1038
+++ distrib/ChangeLog   3 Oct 2006 15:23:08 -0000       1.1039
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/10/03
+5439: Increase required ocaml version to 3.09.3 (schlumpf),
+      remove old TYPE_FORMAT stuff needed for Ocaml < 3.06 (pango)
+
 2006/10/02
 5297: In addition to previous patch 5297 force conversion of allowed_ips to
       IP blocklist when $MLDONKEY_DIR points to an existing directory

Index: src/daemon/common/commonFile.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.mli,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/daemon/common/commonFile.mli    2 Oct 2006 00:28:20 -0000       1.25
+++ src/daemon/common/commonFile.mli    3 Oct 2006 15:23:08 -0000       1.26
@@ -17,8 +17,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-open Autoconf
-
 type 'a file_impl = {
     mutable impl_file_owner : string;
     mutable impl_file_group : string option;
@@ -154,4 +152,4 @@
 val set_file_group_safe : CommonTypes.file -> string -> string option -> bool
 val file_group : CommonTypes.file -> string option
 val file_group_text : CommonTypes.file -> string
-val lprintf_file_nl : CommonTypes.file -> ('a, unit, unit) format -> 'a
+val lprintf_file_nl : CommonTypes.file -> ('a, unit, unit) Pervasives.format 
-> 'a

Index: src/utils/lib/autoconf.ml.new.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/autoconf.ml.new.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/utils/lib/autoconf.ml.new.in    10 Aug 2006 17:41:20 -0000      1.25
+++ src/utils/lib/autoconf.ml.new.in    3 Oct 2006 15:23:08 -0000       1.26
@@ -52,5 +52,3 @@
 let zlib__uncompress_string2 s = Zlib.uncompress_string2 s
 let zlib__compress_string s = Zlib.compress_string s
 let zlib__gzip_string s = Zlib.gzip_string s
-
address@hidden@