From 3bdae5ce26dde706ae016800e036c28b9a5706a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 1 Sep 2005 19:56:17 +0000 Subject: configure.ac: Our cairo plugin code seems to be unaffected by the last bunch of cairo API chances and seems to work w... Original commit message from CVS: * configure.ac: Our cairo plugin code seems to be unaffected by the last bunch of cairo API chances and seems to work with any cairo version between 0.5.0 and 1.0.0, so let's adjust our checks accordingly. --- ChangeLog | 7 +++++++ common | 2 +- configure.ac | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 387a7b9e..39e209d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-31 Tim-Philipp Müller + + * configure.ac: + Our cairo plugin code seems to be unaffected by the last bunch of + cairo API chances and seems to work with any cairo version between + 0.5.0 and 1.0.0, so let's adjust our checks accordingly. + 2005-08-29 Michael Smith * ext/ogg/Makefile.am: diff --git a/common b/common index 89d82b66..b0ee0e42 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 89d82b662da00096b70e70a7a102b294acaae6dd +Subproject commit b0ee0e4262014001faceb47d71c3a44c75ab86b4 diff --git a/configure.ac b/configure.ac index 24b761f6..98515bc5 100644 --- a/configure.ac +++ b/configure.ac @@ -875,7 +875,7 @@ GST_CHECK_FEATURE(AUDIORESAMPLE, [audioresample plug-in], audioresample, [ dnl *** cairo *** translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true) GST_CHECK_FEATURE(CAIRO, [cairo plug-in], cairo, [ - PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0 cairo < 0.6.0, HAVE_CAIRO=yes, HAVE_CAIRO=no) + PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0, HAVE_CAIRO=yes, HAVE_CAIRO=no) AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) ]) -- cgit v1.2.1