From 9b0e18ca34a19114d4db3046d8ebba24c3396d25 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 20 Jan 1999 09:11:29 +0000 Subject: [PATCH] * libltdl/ltdl.c (lt_dlopen): properly detect error condition when full pathname of non-libtool library is provided --- ChangeLog | 3 +++ libltdl/ltdl.c | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74ef488da..0ac0093de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-01-20 Alexandre Oliva + * libltdl/ltdl.c (lt_dlopen): properly detect error condition when + full pathname of non-libtool library is provided + * libltdl/configure.in (libltdl_cv_preloaded_symbols, HAVE_PRELOADED_SYMBOLS): test whether we support -dl*open * libltdl/ltdl.c (!HAVE_PRELOADED_SYMBOLS, lt_preloaded_symbols): diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 19fac064a..1accd116a 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -1072,13 +1072,14 @@ lt_dlopen (filename) last_error = memory_error; return 0; } - if (tryall_dlopen(&handle, filename) && !*dir - && find_library(&handle, basename, usr_search_path) - && find_library(&handle, basename, search_path) + if (tryall_dlopen(&handle, filename) + && (*dir + || (find_library(&handle, basename, usr_search_path) + && find_library(&handle, basename, search_path) #ifdef LTDL_SHLIBPATH_VAR - && find_library(&handle, basename, sys_search_path) + && find_library(&handle, basename, sys_search_path) #endif - ) { + ))) { free(handle); return 0; } -- 2.47.3