2004-05-25 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mono / metadata / mono-config.c

diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
index 1e38529deb79e88090d92febee26af61a62f003b..cef1a7c9560f52ba7733a6877b968c4590ef955a 100644 (file)
--- a/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@ -203,7 +203,6 @@ dllmap_handler = {
        dllmap_finish
 };
 
-
 static int inited = 0;
 
 static void
@@ -272,6 +271,10 @@ mono_config_for_assembly (MonoImage *assembly)
        const char *home;
        
        state.assembly = assembly;
+       cfg_name = g_strdup_printf ("%s.config", assembly->name);
+       mono_config_parse_file_with_context (&state, cfg_name);
+       g_free (cfg_name);
+
        cfg_name = g_strdup_printf ("%s.config", assembly->assembly_name);
 
        home = g_get_home_dir ();
@@ -335,7 +338,7 @@ mono_install_get_config_dir (void)
   int i;
 #endif
 
-  mono_cfg_dir = getenv ("MONO_CFG_DIR");
+  mono_cfg_dir = g_getenv ("MONO_CFG_DIR");
 
   if (!mono_cfg_dir) {
 #ifndef PLATFORM_WIN32