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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/03/27 16:18:17

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

Log message:
        patch #7140

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.324&r2=1.325
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1414&r2=1.1415

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- config/Makefile.in  27 Mar 2010 14:48:06 -0000      1.186
+++ config/Makefile.in  27 Mar 2010 16:18:17 -0000      1.187
@@ -156,6 +156,10 @@
 #  LIBS_byte += -ccopt "$(PTHREAD_CFLAGS)"
 endif
 
+ifneq ("$(PTHREAD_MINGW_CFLAGS)" , "")
+  CFLAGS += $(PTHREAD_MINGW_CFLAGS)
+endif
+
 ifneq ("$(PTHREAD_LIBS)" , "")
   LIBS_flags += -cclib "$(PTHREAD_LIBS)"
 #  LIBS_byte += -cclib "$(PTHREAD_LIBS)"

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -b -r1.324 -r1.325
--- config/configure.in 20 Mar 2010 13:32:44 -0000      1.324
+++ config/configure.in 27 Mar 2010 16:18:17 -0000      1.325
@@ -49,7 +49,7 @@
     OS_FILES=mingw
     OS_FILES2=mingw
     PTHREAD_LIBS="-lpthreadGC2 -lwsock32"
-    PTHREAD_CFLAGS="-DPTW32_STATIC_LIB"
+    PTHREAD_MINGW_CFLAGS="-DPTW32_STATIC_LIB"
     AC_MSG_CHECKING(for mingw-runtime version)
       
 cat >mingw_rt_ver.c <<'END'

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1414
retrieving revision 1.1415
diff -u -b -r1.1414 -r1.1415
--- distrib/ChangeLog   27 Mar 2010 14:48:06 -0000      1.1414
+++ distrib/ChangeLog   27 Mar 2010 16:18:17 -0000      1.1415
@@ -15,6 +15,7 @@
 =========
 
 2010/03/27
+7140: MinGW: Fix linking with Ocaml 3.11.2
 7139: BT: Some improvements and fixes (ygrek)
 - Don't request sources from tracker (set numwant=0) if we don't need them e.g.
   'stopped' event or when sharing