summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-09-01 19:56:17 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-09-01 19:56:17 +0000
commit3bdae5ce26dde706ae016800e036c28b9a5706a2 (patch)
treebf4f9a174ec050c14d2b57cdf3181e992f8ef080
parent706d74d0df48083f9078d05170f39473f6ff5266 (diff)
downloadgstreamer-plugins-bad-3bdae5ce26dde706ae016800e036c28b9a5706a2.tar.gz
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.
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 387a7b9ee..39e209d6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-31 Tim-Philipp Müller <tim at centricular dot net>
+
+ * 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 <msmith@fluendo.com>
* ext/ogg/Makefile.am:
diff --git a/common b/common
-Subproject 89d82b662da00096b70e70a7a102b294acaae6d
+Subproject b0ee0e4262014001faceb47d71c3a44c75ab86b
diff --git a/configure.ac b/configure.ac
index 24b761f6e..98515bc56 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)
])