* libltdl/ltdl.c (lt_dlopen): properly detect error condition when

	full pathname of non-libtool library is provided

diff --git a/ChangeLog b/ChangeLog
index 74ef488daa7684cf624077cc559ae8a3e07d6263..0ac0093de709d80b6ad305388866298af491ffc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * 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 19fac064a865b64041cad4d3ba86228630f3030e..1accd116a85fd094ae0800efd6748d87e0001a1f 100644 (file)
--- 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;
                }