Look for cairo-xlib when checking gdk-x11 deps

svn path=/trunk/; revision=22045
This commit is contained in:
Matthias Clasen 2009-01-02 21:11:58 +00:00
parent f6212513f8
commit 7ad5e9569b
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2009-01-02 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Bug 566334 compile failure for gtk+ on Mac OS X

View File

@ -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"