From: brolley <brolley>
Date: Thu, 29 Apr 2004 20:26:58 +0000 (+0000)
Subject: 2004-04-29  Dave Brolley  <brolley@redhat.com>
X-Git-Tag: reparent-point~2779
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c2500c40cbf4b8d40ca8cdf030ce3ba364071d26;p=pf3gnuchains%2Fpf3gnuchains4x.git

2004-04-29  Dave Brolley  <brolley@redhat.com>

        * compConfig.cxx (register_dso): Check dl_handle before attempting to
        open ".a".
        * Makefile.am (libconfig_la_DEPENDENCIES): Add @LIBLTDL@.
        * Makefile.in: Regenerated.
---

diff --git a/sid/component/cfgroot/ChangeLog b/sid/component/cfgroot/ChangeLog
index 4bef1cf89c..33b34fe37d 100644
--- a/sid/component/cfgroot/ChangeLog
+++ b/sid/component/cfgroot/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-29  Dave Brolley  <brolley@redhat.com>
+
+	* compConfig.cxx (register_dso): Check dl_handle before attempting to
+	open ".a".
+	* Makefile.am (libconfig_la_DEPENDENCIES): Add @LIBLTDL@.
+	* Makefile.in: Regenerated.
+
 2002-05-30  Frank Ch. Eigler  <fche@redhat.com>
 
 	* compConfig.cxx (stop): Store incoming code in new "stop-code"
diff --git a/sid/component/cfgroot/Makefile.am b/sid/component/cfgroot/Makefile.am
index a06b831223..db92841486 100644
--- a/sid/component/cfgroot/Makefile.am
+++ b/sid/component/cfgroot/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES = -I. -I../../include -I$(srcdir)/../../include -I$(srcdir)/libltdl
 libconfig_la_SOURCES = compConfig.cxx
 libconfig_la_LDFLAGS = -module -no-undefined
 libconfig_la_LIBADD = @LIBLTDL@
+libconfig_la_DEPENDENCIES = @LIBLTDL@
 
 pkgdata_DATA = sid-control-cfgroot.txt
 
diff --git a/sid/component/cfgroot/Makefile.in b/sid/component/cfgroot/Makefile.in
index 653f50d953..7edffcf47e 100644
--- a/sid/component/cfgroot/Makefile.in
+++ b/sid/component/cfgroot/Makefile.in
@@ -102,6 +102,7 @@ INCLUDES = -I. -I../../include -I$(srcdir)/../../include -I$(srcdir)/libltdl
 libconfig_la_SOURCES = compConfig.cxx
 libconfig_la_LDFLAGS = -module -no-undefined
 libconfig_la_LIBADD = @LIBLTDL@
+libconfig_la_DEPENDENCIES = @LIBLTDL@
 
 pkgdata_DATA = sid-control-cfgroot.txt
 
@@ -121,7 +122,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libconfig_la_DEPENDENCIES = 
 libconfig_la_OBJECTS =  compConfig.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/sid/component/cfgroot/compConfig.cxx b/sid/component/cfgroot/compConfig.cxx
index e49abf0273..3240bf1c1e 100644
--- a/sid/component/cfgroot/compConfig.cxx
+++ b/sid/component/cfgroot/compConfig.cxx
@@ -726,7 +726,8 @@ cfgroot_component::register_dso(const string& dso_name, const string& _symbol_na
   dl_handle = lt_dlopen(dso_name.c_str());
 
   // Second, try ".la"->".a" kludge.
-  if ((dso_name.length() > 3) &&
+  if (! dl_handle &&
+      (dso_name.length() > 3) &&
       (dso_name[dso_name.length()-3] == '.') &&
       (dso_name[dso_name.length()-2] == 'l') &&
       (dso_name[dso_name.length()-1] == 'a'))