From 7ad5e9569b0c947d68a3a77e8853868d9e124065 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 2 Jan 2009 21:11:58 +0000 Subject: [PATCH] Look for cairo-xlib when checking gdk-x11 deps svn path=/trunk/; revision=22045 --- ChangeLog | 7 +++++++ configure.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e399b89335..825ddf8707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-02 Matthias Clasen + + Bug 565998 – configure script doesn't check for cairo-xlib.pc + + * configure.in: Check for cairo-xlib when looking for + gdk dependencies. Requested by Alberto Ruiz + 2009-01-02 Matthias Clasen Bug 566334 – compile failure for gtk+ on Mac OS X diff --git a/configure.in b/configure.in index 04becf2f74..a473cdecc9 100644 --- a/configure.in +++ b/configure.in @@ -1679,7 +1679,7 @@ LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES cairo-xlib" fi GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"