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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/23 12:19:17

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5479

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

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- config/configure.in 23 Oct 2006 12:18:27 -0000      1.285
+++ config/configure.in 23 Oct 2006 12:19:17 -0000      1.286
@@ -477,9 +477,10 @@
 
 AC_PATH_PROG(OCAMLC,ocamlc.opt,"",[$LOCAL_DIR/bin:$PATH])
 AC_CHECK_TOOL(OCAMLC,ocamlc,ocamlrun ocamlc)
+AC_CHECK_PROG(CAMLP4, camlp4, camlp4)
 
 BUILD_OCAML=no
-if [ test -z "$OCAMLC" ] || [ test "$REQUIRED_OCAML" = "CVS" ]; then
+if [ test -z "$OCAMLC" ] || [ test -z "$CAMLP4" ] || [ test "$REQUIRED_OCAML" 
= "CVS" ]; then
    BUILD_OCAML=yes
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -b -r1.1059 -r1.1060
--- distrib/ChangeLog   23 Oct 2006 12:18:27 -0000      1.1059
+++ distrib/ChangeLog   23 Oct 2006 12:19:17 -0000      1.1060
@@ -15,6 +15,7 @@
 =========
 
 2006/10/23
+5479: Configure: Force presence of camlp4
 5478: Support gdlib-config --static-libs function (new on Debian Etch)
 5476: Urladd: Change default period to 0 (load file only when core starts)