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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/28 18:16:55

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5330

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.974&r2=1.975

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- config/configure.in 28 Aug 2006 18:15:40 -0000      1.278
+++ config/configure.in 28 Aug 2006 18:16:54 -0000      1.279
@@ -50,6 +50,56 @@
     OS_FILES2=mingw
     PTHREAD_LIBS="-lpthreadGC2 -lwsock32"
     PTHREAD_CFLAGS="-DPTW32_STATIC_LIB"
+    AC_MSG_CHECKING(for mingw-runtime version)
+      
+cat >mingw_rt_ver.c <<'END'
+#include <stdio.h>
+#include <_mingw.h>
+main(int argc, char *argv[[]])  {
+
+int required_runtime_major=3;       /**********     change required 
mingw-runtime   **********/
+int required_runtime_minor=10;      /**********              version here      
     **********/
+
+#ifdef __MINGW32_MAJOR_VERSION
+#  ifdef __MINGW32_MINOR_VERSION
+     switch(argv[[1]][[0]]) {
+       case 'x':
+         printf("%d.%d", __MINGW32_MAJOR_VERSION, __MINGW32_MINOR_VERSION);
+         break;
+       case 'y':
+         if ((__MINGW32_MAJOR_VERSION == required_runtime_major && 
__MINGW32_MINOR_VERSION < required_runtime_minor) || 
+             (__MINGW32_MAJOR_VERSION < required_runtime_major)) {
+           printf("no");
+           break; }
+         else {
+           printf("yes");
+           break; }
+       case 'z':
+         printf("%d.%d", required_runtime_major, required_runtime_minor);
+         break;
+     }
+     return 0;
+#  else
+   printf("__MINGW32_MINOR_VERSION not defined in _mingw.h");
+   return 0;
+#  endif
+#else
+ printf("__MINGW32_MAJOR_VERSION not defined in _mingw.h");
+ return 0;
+#endif
+}
+END
+
+    $CC -o mingw_rt_ver ./mingw_rt_ver.c
+    MINGW_RT_VER="`./mingw_rt_ver x`"
+    MINGW_RT_VER_OK="`./mingw_rt_ver y`"
+    MINGW_RT_VER_REQ="`./mingw_rt_ver z`"
+    rm -f mingw_rt_ver mingw_rt_ver.*
+    AC_MSG_RESULT($MINGW_RT_VER)
+    if test "$MINGW_RT_VER_OK" = "no"; then
+      echo "********  mingw-runtime version $MINGW_RT_VER_REQ is required  
*********" 1>&2;
+      exit 1
+    fi
     ;;
   *cygwin*)
     SYSTEM=cygwin

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -b -r1.974 -r1.975
--- distrib/ChangeLog   28 Aug 2006 18:15:40 -0000      1.974
+++ distrib/ChangeLog   28 Aug 2006 18:16:55 -0000      1.975
@@ -15,6 +15,7 @@
 =========
 
 2006/08/28
+5330: Configure: Check MinGW version, at least 3.10 is needed (Schlumpf)
 5329: some configure improvements and cleanups (Schlumpf)
 
 2006/08/26