[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog |
Date: |
Sun, 23 May 2010 09:03:29 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 10/05/23 09:03:29
Modified files:
config : configure.in
distrib : ChangeLog
Log message:
patch #7200
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.326&r2=1.327
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1429&r2=1.1430
Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -b -r1.326 -r1.327
--- config/configure.in 25 Apr 2010 13:26:46 -0000 1.326
+++ config/configure.in 23 May 2010 09:03:29 -0000 1.327
@@ -486,7 +486,7 @@
else
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
case "$OCAMLVERSION" in
- "$REQUIRED_OCAML"*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+ "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
*)
echo "Need build"
BUILD_OCAML=yes
@@ -640,7 +640,7 @@
OCAMLLIB=`$OCAMLC -where`
REBUILD_OCAML=no
case "$OCAMLVERSION" in
- 3.10*|3.11*)
+ 3.10*|3.11*|3.12*)
if test "$GUI" = "oldgui"; then
OLDGUI_NO_310=yes
GUI=no
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1429
retrieving revision 1.1430
diff -u -b -r1.1429 -r1.1430
--- distrib/ChangeLog 25 Apr 2010 13:26:46 -0000 1.1429
+++ distrib/ChangeLog 23 May 2010 09:03:29 -0000 1.1430
@@ -14,6 +14,8 @@
ChangeLog
=========
+7200: Allow compilation with upcoming Ocaml 3.12
+-------------------------------------------------------------------------------
2010/04/25: version 3.0.2 = tag release-3-0-2
7175: DC: PtokaX compatibility (ygrek)
7169: Equal scales for graphical up/down stats (ygrek)
- [Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog,
mldonkey-commits <=