From b47b15f6ba401c735d415e65d1fa7620e3546968 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 3 Mar 2002 04:16:30 +0000 Subject: Fixes for uninstalled operation with module suffixes other than .so and in Sat Mar 2 23:08:23 2002 Owen Taylor Fixes for uninstalled operation with module suffixes other than .so and in general for platforms like AIX where the module suffix isn't predictable. (#72185, problems reported by Miroslaw Dobrzanski-Neumann) * modules/input/Makefile.am (gtk.immodules): Query .la files rather than shared objects in .libs when creating the uninstalled gtk.immodules file. * gtk/gtkmain.c (_gtk_find_module): Look for .la files after looking for the normal soname extension to handle cases where the soname extension isn't predictable, like AIX. * gtk/gtkthemes.c (gtk_theme_engine_load): Don't call g_module_build_path... leave that to gtk_rc_find_module_in_path. * demos/gtk-demo/main.c (main) demos/pixbuf-init.c (pixbuf_init): tests/testgtk.c (test_init): tests/testtext.c (test_init) tests/testdnd.c (test_init): Point gdk-pixbuf to .la files rather than poking in .libs for .so files. * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): Remove .libs from GDK_PIXBUF_MODULEDIR. --- demos/pixbuf-init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demos/pixbuf-init.c') diff --git a/demos/pixbuf-init.c b/demos/pixbuf-init.c index 3d4edee090..a8803e5f82 100644 --- a/demos/pixbuf-init.c +++ b/demos/pixbuf-init.c @@ -14,6 +14,6 @@ file_exists (const char *filename) void pixbuf_init () { - if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so")) - putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs"); + if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la")) + putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf"); } -- cgit v1.2.1