summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-03-03 04:16:30 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-03-03 04:16:30 +0000
commitb47b15f6ba401c735d415e65d1fa7620e3546968 (patch)
treeb75d276379a8b722afc17984453dee763a29ae51 /tests
parentb3c0813b93a2aa0f39a6b06128e2b7ad9cca9175 (diff)
downloadgtk+-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 'tests')
-rw-r--r--tests/testdnd.c4
-rw-r--r--tests/testgtk.c4
-rw-r--r--tests/testtext.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/testdnd.c b/tests/testdnd.c
index cbc1bfb58e..9ac1baec07 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -555,10 +555,10 @@ source_drag_data_delete (GtkWidget *widget,
void
test_init ()
{
- 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=./gtk.immodules");
}
}
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 888860f10e..aa032bb00e 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -11592,9 +11592,9 @@ create_main_window (void)
static void
test_init ()
{
- if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
+ if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
{
- putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
+ putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf");
putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");
}
}
diff --git a/tests/testtext.c b/tests/testtext.c
index e9c67dc22d..efef058602 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -2536,7 +2536,7 @@ file_exists (const char *filename)
void
test_init ()
{
- if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
+ if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
{
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");