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

[mldonkey-commits]

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

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7253

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.328&r2=1.329
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1448&r2=1.1449

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -b -r1.328 -r1.329
--- config/configure.in 24 May 2010 18:06:56 -0000      1.328
+++ config/configure.in 18 Jul 2010 14:54:44 -0000      1.329
@@ -532,10 +532,13 @@
           $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.09/ocaml-"$REQUIRED_OCAML".tar.gz
+          $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.12/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
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
-          $WGET 
http://caml.inria.fr/pub/distrib/ocaml-3.11/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
@@ -1180,7 +1183,14 @@
         AC_MSG_CHECKING(for librsvg - version >= $REQUIRED_RSVG)
         if pkg-config --atleast-version $REQUIRED_RSVG $PKG_RSVG; then
           GTK_CONFIG="pkg-config $PKG_GTK $PKG_RSVG"
-          REQUIRED_LABLGTK=2.10.1
+          case "$OCAMLVERSION" in
+              3.08*|3.09*)
+                REQUIRED_LABLGTK=2.12.0
+                ;;
+              *)
+                REQUIRED_LABLGTK=2.14.1
+                ;;
+          esac
           LABLGTK_NAME=lablgtk2
           AC_MSG_RESULT(yes)
         else

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1448
retrieving revision 1.1449
diff -u -b -r1.1448 -r1.1449
--- distrib/ChangeLog   18 Jul 2010 14:52:42 -0000      1.1448
+++ distrib/ChangeLog   18 Jul 2010 14:54:45 -0000      1.1449
@@ -15,6 +15,7 @@
 =========
 
 2010/07/18
+7253: Fix downloading Ocaml 3.12 archive, use lablgtk-2.12.0 for Ocaml < 3.10
 7252: GTK2 GUI: Fix compile bug with lablgtk2-20100620 and Ocaml 3.12
 7251: BT: OCaml 3.08.3 compatibility fix (ygrek)
 7250: DC: discover self IP (ygrek)