libltdl: Fix libltdl early failures for multi-arch

Since there could be multiple files for libltdl to try dlopening,
libltdl should not fail after the first attempted file.

Reported: https://savannah.gnu.org/support/?111214

* libltdl/ltdl.c: Change return if dlopen() fails.
* libltdl/ltdl.mk: Update serial.

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 74bfe431004b5313ef0812e40135083b41baffaa..60495415230241aed36d9bd315511e36c4f1777a 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -785,10 +785,9 @@ find_handle_callback (char *filename, void *data, void *data2)
   if (notfound)
     return 0;
 
-  /* Try to dlopen the file, but do not continue searching in any
-     case.  */
+  /* Try to dlopen the file. */
   if (tryall_dlopen (phandle, filename, advise, 0) != 0)
-    *phandle = 0;
+    return 0;
 
   return 1;
 }

diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index 4610977590e14229925440ce4a8191eaed680774..0cb427d827af889f25aef123a954432236404c81 100644 (file)
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -35,7 +35,7 @@ AM_CPPFLAGS          += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
                          -I$(srcdir)/libltdl -Ilibltdl/libltdl \
                          -I$(srcdir)/libltdl/libltdl
 AM_LDFLAGS            += -no-undefined
-LTDL_VERSION_INFO      = -version-info 10:4:3
+LTDL_VERSION_INFO      = -version-info 10:5:3
 
 noinst_LTLIBRARIES     += $(LT_DLLOADERS)