diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-12-08 23:55:45 +0300 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-12-08 23:55:45 +0300 |
| commit | 5237044b7f7fdb612a168a45dd71c366540e14e5 (patch) | |
| tree | 923e5d146c6897778807af4fd56efa8c2dd40317 | |
| parent | 51643b5b334b186860c0d2844deed289cb56827c (diff) | |
from head
svn path=/branches/mono-1-1-10/mono/; revision=54124
| -rw-r--r-- | mono/metadata/ChangeLog | 6 | ||||
| -rw-r--r-- | mono/metadata/filewatcher.c | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index f8450f1414d..07a16da3305 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,9 @@ +2005-12-01 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * filewatcher.c: try loading libgamin-1.so.0 before libfam, since at + least on SUSE 10 they are not the same (on debian, they are just the + same thing). + 2005-11-24 Dick Porter <dick@ximian.com> * process.c diff --git a/mono/metadata/filewatcher.c b/mono/metadata/filewatcher.c index 7f8deeaceee..e90ea85e328 100644 --- a/mono/metadata/filewatcher.c +++ b/mono/metadata/filewatcher.c @@ -104,12 +104,20 @@ ves_icall_System_IO_FSW_SupportsFSW (void) #else GModule *fam_module; gchar *filename; + int lib_used = 4; /* gamin */ MONO_ARCH_SAVE_REGS; - filename = g_module_build_path (NULL, "libfam.so.0"); + filename = g_module_build_path (NULL, "libgamin-1.so.0"); fam_module = g_module_open (filename, G_MODULE_BIND_LAZY); g_free (filename); + if (fam_module == NULL) { + lib_used = 2; /* FAM */ + filename = g_module_build_path (NULL, "libfam.so.0"); + fam_module = g_module_open (filename, G_MODULE_BIND_LAZY); + g_free (filename); + } + if (fam_module == NULL) return 0; @@ -117,7 +125,7 @@ ves_icall_System_IO_FSW_SupportsFSW (void) if (FAMNextEvent == NULL) return 0; - return 2; + return lib_used; #endif } |