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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/27 08:33:40

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5499

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.286&r2=1.287
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1069&r2=1.1070

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- config/configure.in 23 Oct 2006 12:19:17 -0000      1.286
+++ config/configure.in 27 Oct 2006 08:33:40 -0000      1.287
@@ -477,7 +477,7 @@
 
 AC_PATH_PROG(OCAMLC,ocamlc.opt,"",[$LOCAL_DIR/bin:$PATH])
 AC_CHECK_TOOL(OCAMLC,ocamlc,ocamlrun ocamlc)
-AC_CHECK_PROG(CAMLP4, camlp4, camlp4)
+AC_PATH_PROG(CAMLP4, camlp4,"",[$LOCAL_DIR/bin:$PATH])
 
 BUILD_OCAML=no
 if [ test -z "$OCAMLC" ] || [ test -z "$CAMLP4" ] || [ test "$REQUIRED_OCAML" 
= "CVS" ]; then

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -u -b -r1.1069 -r1.1070
--- distrib/ChangeLog   26 Oct 2006 13:18:42 -0000      1.1069
+++ distrib/ChangeLog   27 Oct 2006 08:33:40 -0000      1.1070
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/10/27
+5499: Configure: find camlp4 in local, fix patch 5479 (dunk)
+
 2006/10/26
 5477: BT: Add downloads to share list after core restart