[Mldonkey-commits] Changes to mldonkey/src/daemon/common/commonGlobals.ml

[mldonkey-commits]

Index: mldonkey/src/daemon/common/commonGlobals.ml
diff -u mldonkey/src/daemon/common/commonGlobals.ml:1.42 
mldonkey/src/daemon/common/commonGlobals.ml:1.43
--- mldonkey/src/daemon/common/commonGlobals.ml:1.42    Fri Jul 29 20:56:50 2005
+++ mldonkey/src/daemon/common/commonGlobals.ml Mon Aug  1 20:09:13 2005
@@ -82,22 +82,47 @@
     "MLNet Multi-Network p2p client version " ^ Autoconf.current_version
       ^ (if Autoconf.scm_version <> "" then "\nSCM version info: " ^ 
Autoconf.scm_version else "")
       ^ "\nNetworks: " ^ !networks_string
+      ^ "\nOcaml version: " ^ Autoconf.ocaml_version
+      ^ "\nBuild on: " ^ Autoconf.build_system
+          ^ (if Autoconf.glibc_version <> "" then " with glibc " ^ 
Autoconf.glibc_version else "")
+         ^ (let real_glibc_version = MlUnix.glibc_version_num () in
+              if real_glibc_version <> Autoconf.glibc_version
+                && real_glibc_version <> "" then
+                  Printf.sprintf " (DANGER: glibc %s present on system)" 
real_glibc_version else "")
+      ^ (if Autoconf.configure_arguments <> "" then "\nConfigure arguments: " 
^ Autoconf.configure_arguments else "")
+      ^ (if !patches_string <> "" then "\n" ^ !patches_string else "")
       ^ "\nFeatures:"
           ^ (if BasicSocket.has_threads () then " threads" else " no-threads")
-          ^ (if Autoconf.has_zlib then " zlib" else " no-zlib")
-          ^ (if Autoconf.has_bzip2 then " bzip2" else " no-bzip2")
-          ^ (if Autoconf.has_gd && Autoconf.has_gd_png && Autoconf.has_gd_jpg 
then " gd(jpg/png)" else "")
-         ^ (if Autoconf.has_gd && Autoconf.has_gd_png && not 
Autoconf.has_gd_jpg then " gd(png)" else "")
+          ^ (if Autoconf.has_zlib then
+              begin
+                let s = Zlib.zlib_version_num () in
+                  Printf.sprintf " zlib%s" (if s <> "" then "-" ^ s else "")
+              end
+            else " no-zlib")
+          ^ (if Autoconf.has_bzip2 then
+              begin
+                let s = List.hd(String2.split_simplify
+                  (Bzip2.bzlib_version_num ()) ',') in
+                    Printf.sprintf " bzip2%s" (if s <> "" then "-" ^ s else "")
+              end
+            else " no-bzip2")
+          ^ (if Autoconf.has_gd && Autoconf.has_gd_png && Autoconf.has_gd_jpg 
then
+              Printf.sprintf " gd(jpg/png%s)"
+                (let s = Gd.png_version_num () in
+                   if s <> "" then "-" ^ s else "")
+            else "")
+          ^ (if Autoconf.has_gd && Autoconf.has_gd_png && not 
Autoconf.has_gd_jpg then
+              Printf.sprintf " gd(png%s)"
+                (let s = Gd.png_version_num () in
+                   if s <> "" then "-" ^ s else "")
+            else "")
          ^ (if Autoconf.has_gd && not Autoconf.has_gd_png && 
Autoconf.has_gd_jpg then " gd(jpg)" else "")
          ^ (if not Autoconf.has_gd then " no-gd" else "")
           ^ (if Autoconf.has_iconv then " iconv" else " no-iconv")
           ^ (if Autoconf.check_bounds then " check-bounds" else " 
no-check-bounds")
           ^ " " ^ Autoconf.sha1_version
-      ^ "\nOcaml version: " ^ Autoconf.ocaml_version
-      ^ "\nBuild on: " ^ Autoconf.build_system
-          ^ (if Autoconf.glibc_version <> "" then " with glibc " ^ 
Autoconf.glibc_version else "")
-      ^ (if Autoconf.configure_arguments <> "" then "\nConfigure arguments: " 
^ Autoconf.configure_arguments else "")
-      ^ (if !patches_string <> "" then "\n" ^ !patches_string else "")
+      ^ "\nLanguage: " ^ Charset.default_language
+      ^ " - locale: " ^ Charset.locstr
   )
 
 (* Should we try to find another port when we cannot bind to the one set