From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 2 Feb 2001 20:40:51 +0000 (+0000)
Subject: * libltdl/ltdl.c (load_deplibs): Make sure the depcount is reset,
X-Git-Tag: multi-language-merge-point~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c87b016608015bc47d5997e5c9373c2e3ae8ffb;p=thirdparty%2Flibtool.git

* 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 c8ce78bd8..b092b1358 100644
--- 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 e39e518c0..4e138ca2b 100644
--- 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;