From bedf0bc1c0e88dc23e36336107088c0b3ccb84f9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 11 Oct 2006 12:41:14 +0000 Subject: Enable having some gdk-pixbuf loaders built-in even if loading the others 2006-10-11 Tor Lillqvist * configure.in: Enable having some gdk-pixbuf loaders built-in even if loading the others dynamically. Define Automake conditional INCLUDE_FOO for each loader as TRUE if that loader is built-in. See also gdk-pixbuf/ChangeLog. 2006-10-11 Tor Lillqvist Enable having some loaders built-in even if loading the others dynamically. Have loaders in the same order as in configure.in in all places where they are handled/listed. * Makefile.am: Define the STATIC_FOO_LIB and FOO_LIB macros conditionally depending on whether said loader is built-in or not. Use the names libstatic-pixbufloader-foo.la instead of libpixbufloader-static-foo.la for the built-in ones so that the "echo libpixbufloader-*.la" won't match them. * gdk-pixbuf-io.c: Reorganize code as to plumb the built-in loaders also if USE_GMODULE. Don't warn about a missing gdk-pixbuf.loaders file if we have at least one included loader. * gdk-pixbuf-private.h * io-*.c: Don't define a generic MODULE_ENTRY, as we can't use it in the loaders anyway. Each loader needs to check if INCLUDE_foo is defined. --- gdk-pixbuf/io-xpm.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gdk-pixbuf/io-xpm.c') diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index 8959a0483..558196f84 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -781,6 +781,12 @@ gdk_pixbuf__xpm_image_load_increment (gpointer data, return TRUE; } +#ifndef INCLUDE_xpm +#define MODULE_ENTRY(type,function) function +#else +#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function +#endif + void MODULE_ENTRY (xpm, fill_vtable) (GdkPixbufModule *module) { -- cgit v1.2.1