* libltdl/ltdl.c (load_deplibs): Make sure the depcount is reset,

even when deplibs are not used because of the patch below.

diff --git a/ChangeLog b/ChangeLog
index c8ce78bd89ae8831d9e699700b1f0703e1a6374b..b092b135856d1111ad134f5f1b4eb5f739223648 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-02  Gary V. Vaughan  <gvv@techie.com>
 
+       * libltdl/ltdl.c (load_deplibs): Make sure the depcount is reset,
+       even when deplibs are not used because of the patch below.
+
        * ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS): If we know that the host
        architecture automatically loads deplibs, then...
        * libltdl/ltdl.c (load_deplibs): ...don't manually load each one.
@@ -18,7 +21,7 @@
        * libltdl/ltdl.c (load_deplibs): If loading a deplib fails,
        don't sweat -- it may be a lib that is already statically linked
        into the loading application.
-       
+
        * libltdl/ltdl.c: Clean up the shadowing of the global handles
        variable.
        (LT_DLRESIDENT_FLAGS): Add extra parens to satisfy -Wall.

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index e39e518c0fccb413af4bbc091aa76b033e200789..4e138ca2b3e12ffea61bb0af262f9e8be5e8db07 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1565,17 +1565,18 @@ load_deplibs(handle, deplibs)
      lt_dlhandle handle;
      char *deplibs;
 {
-  int  ret = 0;
-
 #if LTDL_DLOPEN_DEPLIBS
-
   char *p, *save_search_path;
   int   depcount = 0;
   int  i;
   char **names = 0;
+#endif
+  int  ret = 0;
 
-  ret = 1;
   handle->depcount = 0;
+
+#if LTDL_DLOPEN_DEPLIBS
+  ret = 1;
   if (!deplibs)
     {
       return 0;