build the library name ourselfs ... so we can load the library specified

2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gmodule/gmodule.c (parse_libtool_archive): build the library
	name ourselfs ... so we can load the library specified and not
	mangle any name not beggining in 'lib'. Patch from Michael Meeks
	<michael@ximian.com>.

diff --git a/ChangeLog b/ChangeLog
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4359244..ad63dad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-07-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gmodule/gmodule.c (parse_libtool_archive): build the library
+       name ourselfs ... so we can load the library specified and not
+       mangle any name not beggining in 'lib'. Patch from Michael Meeks
+       <michael@ximian.com>.
+
 2001-07-29  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c: Matthias Classen's patch to give

diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index a6b179a..62f7b8f 100644 (file)
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -265,7 +265,7 @@ parse_libtool_archive (const gchar* libtool_name)
       lt_libdir = g_strconcat (dir, G_DIR_SEPARATOR_S ".libs", NULL);
     }
 
-  name = g_module_build_path (lt_libdir, lt_dlname);
+  name = g_strconcat (lt_libdir, G_DIR_SEPARATOR_S, lt_dlname, NULL);
   
   g_free (lt_dlname);
   g_free (lt_libdir);