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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/08/07 14:51:54

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7272

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.330&r2=1.331
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1454&r2=1.1455

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- config/configure.in 1 Aug 2010 12:15:23 -0000       1.330
+++ config/configure.in 7 Aug 2010 14:51:54 -0000       1.331
@@ -279,9 +279,9 @@
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
 
-REQUIRED_OCAML=3.11.2
-DOWNLOAD_OCAML_MAJOR=3.11
-DOWNLOAD_OCAML=3.11.2
+REQUIRED_OCAML=3.12.0
+DOWNLOAD_OCAML_MAJOR=3.12
+DOWNLOAD_OCAML=3.12.0
 
 REQUIRED_LABLGTK=1.2.7
 
@@ -643,9 +643,9 @@
 OCAMLLIB=`$OCAMLC -where`
 REBUILD_OCAML=no
 case "$OCAMLVERSION" in
-    3.10*|3.11*|3.12*)
+    3.1*)
       if test "$GUI" = "oldgui"; then
-        OLDGUI_NO_310=yes
+        OLDGUI_NO_31=yes
         GUI=no
       fi
       ;;
@@ -1601,8 +1601,8 @@
   fi
 fi
 
-if test "$OLDGUI_NO_310" = "yes"; then
-  echo " - GUI support       GTK1 oldgui does not work with Ocaml 3.10/3.11, 
disabled"
+if test "$OLDGUI_NO_31" = "yes"; then
+  echo " - GUI support       GTK1 oldgui does not work with Ocaml 3.1*, 
disabled"
 fi
 
 if test "$TARGET_TYPE" = "byte"; then

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1454
retrieving revision 1.1455
diff -u -b -r1.1454 -r1.1455
--- distrib/ChangeLog   7 Aug 2010 14:51:14 -0000       1.1454
+++ distrib/ChangeLog   7 Aug 2010 14:51:54 -0000       1.1455
@@ -15,6 +15,7 @@
 =========
 
 2010/08/07:
+7272: Configure: Use Ocaml 3.12.0 as default compiler
 7269: Fix typos (glondu)
 -------------------------------------------------------------------------------
 2010/08/01: version 3.0.3 = tag release-3-0-3