diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-03 04:16:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-03 04:16:30 +0000 |
| commit | b47b15f6ba401c735d415e65d1fa7620e3546968 (patch) | |
| tree | b75d276379a8b722afc17984453dee763a29ae51 /demos | |
| parent | b3c0813b93a2aa0f39a6b06128e2b7ad9cca9175 (diff) | |
| download | gtk+-b47b15f6ba401c735d415e65d1fa7620e3546968.tar.gz | |
Fixes for uninstalled operation with module suffixes other than .so and in
Sat Mar 2 23:08:23 2002 Owen Taylor <otaylor@redhat.com>
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.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/main.c | 4 | ||||
| -rw-r--r-- | demos/pixbuf-init.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 6f1a4abe18..d96cc9fb0a 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -808,10 +808,10 @@ main (int argc, char **argv) * these few lines, which are just a hack so gtk-demo will work * in the GTK tree without installing it. */ - if (g_file_test ("../../gdk-pixbuf/.libs/libpixbufloader-pnm.so", + if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la", G_FILE_TEST_EXISTS)) { - putenv ("GDK_PIXBUF_MODULEDIR=../../gdk-pixbuf/.libs"); + putenv ("GDK_PIXBUF_MODULEDIR=../../gdk-pixbuf"); putenv ("GTK_IM_MODULE_FILE=../../modules/input/gtk.immodules"); } /* -- End of hack -- */ 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"); } |