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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       13/07/07 11:46:35

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #8114

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.356&r2=1.357
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1578&r2=1.1579

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -b -r1.356 -r1.357
--- config/configure.in 5 Aug 2012 15:49:02 -0000       1.356
+++ config/configure.in 7 Jul 2013 11:46:34 -0000       1.357
@@ -615,6 +615,9 @@
           $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-4.00/ocaml-"$REQUIRED_OCAML".tar.gz
+        fi
+        if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
           echo "********        download OCaml $REQUIRED_OCAML not successful, 
try do download it manually       *********" 1>&2;
           echo "********        from http://caml.inria.fr/pub/distrib/         
                          *********" 1>&2;
           echo "********        and copy the tar.gz into $PATCH_DIR            
  *********" 1>&2;

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1578
retrieving revision 1.1579
diff -u -b -r1.1578 -r1.1579
--- distrib/ChangeLog   7 Jul 2013 11:07:13 -0000       1.1578
+++ distrib/ChangeLog   7 Jul 2013 11:46:35 -0000       1.1579
@@ -15,6 +15,7 @@
 =========
 
 2013/07/07:
+8114: Fix --enable-force-ocaml with Ocaml 4.00.x
 8111: http: New option http_root_url specifies root url for the web interface 
(ygrek)
 8113: IP discover: Fix broken URL
 8112: BT/HTML: select/unselect whole directories in BT multifile downloads 
(ygrek)