diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-05-05 12:27:21 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-05-05 13:20:47 +0100 |
| commit | 3d9f6d9615b9eced50409f137c60d96eb18b347d (patch) | |
| tree | 9e60b1b11d2157e36cc5757e54520bcc52446c6a | |
| parent | 732704c007f6119010fdace995ce246b10ba9f91 (diff) | |
configure: make gdk-pixbuf plugin depend only on gdk-pixbuf, not gtk+
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/pixbufscale.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7b49e2edc..16852937a 100644 --- a/configure.ac +++ b/configure.ac @@ -715,7 +715,7 @@ AG_GST_CHECK_FEATURE(GCONF, [GConf libraries], gconfelements, [ dnl *** GDK pixbuf *** translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true) AG_GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbuf, [ - if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi; + AG_GST_PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.8.0) ]) dnl *** HAL *** diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index 8b08817ed..cf5265c2e 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -4,11 +4,11 @@ libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c libgstgdkpixbuf_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) $(GTK_CFLAGS) + $(GST_CFLAGS) $(GDK_PIXBUF_CFLAGS) libgstgdkpixbuf_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ - $(GST_LIBS) $(GTK_LIBS) + $(GST_LIBS) $(GDK_PIXBUF_LIBS) libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/gdk_pixbuf/pixbufscale.h b/ext/gdk_pixbuf/pixbufscale.h index 588665c10..686bf4dc0 100644 --- a/ext/gdk_pixbuf/pixbufscale.h +++ b/ext/gdk_pixbuf/pixbufscale.h @@ -23,9 +23,9 @@ #ifndef __GST_PIXBUFSCALE_H__ #define __GST_PIXBUFSCALE_H__ -#include <gtk/gtk.h> #include <gst/gst.h> #include <gst/base/gstbasetransform.h> +#include <gdk-pixbuf/gdk-pixbuf.h> G_BEGIN_DECLS |