From 2468916bcc5f263efba28f9991b45d7ae30c556d Mon Sep 17 00:00:00 2001 From: Mark Crichton Date: Fri, 3 Mar 2000 03:57:15 +0000 Subject: [PATCH] Merged in changes. Merged in changes. If this doesn't work, I blame the NWO conspiracy. I need to go put my tin foil hat back on now, and keep a lookout for the black helicopters. --- gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/Makefile.am | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 6c9d9af097..3ca009a208 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2000-03-01 Mark Crichton + + * configure.in: Added BUILD_CANVAS_ITEM stuff to (finally) + fix the last auto* build bug (where we have libart, but no + gnome-libs) + + * gdk-pixbuf/Makefile.am: Same. + 2000-02-28 Matt Wilson * gdk-pixbuf/gdk-pixbuf-drawable.c: s/unsigned long/guint32/g, diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 4a628fae8b..9e34123b3e 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,20 +1,20 @@ SUBDIRS = pixops -if INSIDE_GNOME_LIBS +if BUILD_CANVAS_ITEM +CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la +CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h +libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c +EXTRA_GNOME_LIBS = $(GNOME_LIBS) +else CANVAS_PIXBUF_LIB = CANVAS_PIXBUF_HEADERFILES = EXTRA_GNOME_LIBS = -else -CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la -CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h -EXTRA_GNOME_LIBS = $(GNOME_LIBS) endif lib_LTLIBRARIES = \ libgdk_pixbuf.la \ $(CANVAS_PIXBUF_LIB) -libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS) libexecdir = $(libdir)/gdk-pixbuf/loaders