gegl r2104 - in trunk: . operations/external

[neo svn gnome org]

Author: neo
Date: Fri Feb 22 11:06:30 2008
New Revision: 2104
URL: http://svn.gnome.org/viewvc/gegl?rev=2104&view=rev

Log:
2008-02-22  Sven Neumann  <sven gimp org>

	* configure.ac
	* operations/external/Makefile.am: added check for GdkPixbuf and
	pass the proper flags to the compiler and linker.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/external/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 22 11:06:30 2008
@@ -483,6 +483,16 @@
 AC_SUBST(PANGOCAIRO_LIBS) 
 
 
+######################
+# Check for gdk-pixbuf
+######################
+
+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
+  have_gdk_pixbuf="yes",
+  have_gdk_pixbuf="no  (gdk-pixbuf not found)")
+AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes")
+
+
 ###################
 # Check for libjpeg
 ###################
@@ -725,6 +735,7 @@
   Cairo:          $have_cairo
   Pango:          $have_pango
   pangocairo:     $have_pangocairo
+  GDKPixbuf:      $have_gdk_pixbuf
   JPEG:           $jpeg_ok
   PNG:            $have_libpng
   OpenEXR:        $have_openexr

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Fri Feb 22 11:06:30 2008
@@ -47,7 +47,6 @@
 jpg_load_la_LIBADD = $(op_libs) $(LIBJPEG)
 endif
 
-
 if HAVE_RSVG
 ops += svg-load.la
 svg_load_la_SOURCES = svg-load.c
@@ -55,15 +54,15 @@
 svg_load_la_CFLAGS = $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
 endif
 
-if HAVE_GTK
+if HAVE_GDK_PIXBUF
 ops += pixbuf.la save-pixbuf.la
 pixbuf_la_SOURCES      = pixbuf.c
-pixbuf_la_LIBADD       = $(op_libs) $(CAIRO_LIBS) $(RSVG_LIBS)
-pixbuf_la_CFLAGS       = $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
+pixbuf_la_LIBADD       = $(op_libs) $(GDK_PIXBUF_LIBS)
+pixbuf_la_CFLAGS       = $(GDK_PIXBUF_CFLAGS)
 
 save_pixbuf_la_SOURCES = save-pixbuf.c
-save_pixbuf_la_LIBADD  = $(op_libs) $(CAIRO_LIBS) $(RSVG_LIBS)
-save_pixbuf_la_CFLAGS  = $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
+save_pixbuf_la_LIBADD  = $(op_libs) $(GDK_PIXBUF_LIBS)
+save_pixbuf_la_CFLAGS  = $(GDK_PIXBUF_CFLAGS)
 endif
 
 if HAVE_OPENEXR