[Mldonkey-commits] mldonkey config/Makefile.in config/configure.in...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/09/01 19:00:50

Modified files:
        config         : Makefile.in configure.in 
        distrib        : ChangeLog 

Log message:
        patch #7296

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.190&r2=1.191
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.338&r2=1.339
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1467&r2=1.1468

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- config/Makefile.in  29 Aug 2010 20:17:56 -0000      1.190
+++ config/Makefile.in  1 Sep 2010 19:00:46 -0000       1.191
@@ -135,14 +135,8 @@
 
 BITSTRING_SRCS = \
   $(BITSTRING)/bitstring.ml \
-  $(BITSTRING)/bitstring_persistent.mlc4 \
   $(BITSTRING)/bitstring_c.c
 
-BITSTRING_LIBS_flags = -I +camlp4
-BITSTRING_LIBS_opt = $(CAMLP4LIB_OPT)
-BITSTRING_STATIC_LIBS_opt = $(BITSTRING_LIBS_opt)
-BITSTRING_LIBS_byte = $(CAMLP4LIB_BYTE)
-
 ifeq ("$(BZIP2)", "yes")
   LIBS_flags += -cclib -lbz2
   CDK_SRCS +=  $(CDK)/bzlib.ml $(CDK)/bzip2.ml
@@ -436,11 +430,14 @@
   $(SRC_FASTTRACK)/fasttrackInteractive.mlt \
   $(SRC_FASTTRACK)/fasttrackMain.mlt
 
-$(BITSTRING)/pa_bitstring.cmo: $(BITSTRING)/pa_bitstring.mlt 
build/bitstring.cma
-       $(OCAMLC) build/bitstring.cma -I $(BITSTRING) -I +camlp4 camlp4lib.cma 
-pp '$(CAMLP4OF) -impl' -c $<
+$(BITSTRING)/bitstring_persistent.cmo: $(BITSTRING)/bitstring_persistent.ml 
$(BITSTRING)/bitstring_persistent.cmi build/bitstring.cma
+       $(OCAMLC) -I $(BITSTRING) -I +camlp4 camlp4lib.cma -c $<
+
+$(BITSTRING)/pa_bitstring.cmo: $(BITSTRING)/pa_bitstring.mlt 
$(BITSTRING)/bitstring_persistent.cmo build/bitstring.cma
+       $(OCAMLC) -I $(BITSTRING) -I +camlp4 camlp4lib.cma -pp '$(CAMLP4OF) 
-impl' -c $^
 
 $(SRC_BITTORRENT)/bTUdpTracker.ml: $(SRC_BITTORRENT)/bTUdpTracker.mlp 
$(BITSTRING)/pa_bitstring.cmo
-       $(CAMLP4OF) build/bitstring.cma $(BITSTRING)/pa_bitstring.cmo -impl $< 
-o $@
+       $(CAMLP4OF) build/bitstring.cma $(BITSTRING)/bitstring_persistent.cmo 
$(BITSTRING)/pa_bitstring.cmo -impl $< -o $@
 
 BITTORRENT_SRCS= \
   $(BITSTRING_SRCS) \

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -b -r1.338 -r1.339
--- config/configure.in 29 Aug 2010 20:17:56 -0000      1.338
+++ config/configure.in 1 Sep 2010 19:00:49 -0000       1.339
@@ -644,7 +644,7 @@
   AC_CHECK_PROG(OCAMLDOC, ocamldoc, ocamldoc)
   AC_CHECK_PROG(OCAMLMKTOP, ocamlmktop, ocamlmktop)
   AC_CHECK_PROG(CAMLP4, camlp4, camlp4)
-  AC_CHECK_PROG(CAMLP4OF, camlp4of, camlp4of, no)
+  AC_CHECK_PROG(CAMLP4OF, camlp4of, camlp4of, $CAMLP4 pa_o.cmo pr_o.cmo 
Camlp4QuotationExpander.cmo Camlp4GrammarParser.cmo)
 fi
 fi
 

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -b -r1.1467 -r1.1468
--- distrib/ChangeLog   29 Aug 2010 20:17:56 -0000      1.1467
+++ distrib/ChangeLog   1 Sep 2010 19:00:50 -0000       1.1468
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2010/09/01
+7296: Fix compilation problems introduced by patch 7144 (ygrek)
+- remove linking to camlp4lib
+- use alternative if camlp4of is not present
+
 2010/08/29
 7144: BT: Support for UDP trackers (ygrek)
 7288: HTML: Prepare localization (balamutick)