summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-03-07 13:28:06 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-03-07 13:28:06 +0000
commite82812b2dc6bb8066e1c850e68e72c021b5edb33 (patch)
tree7de2341d825b341676fef874e4f653d94797dd4a
parentdb1ef249b6a49b52d0efe964c7f477bbed154098 (diff)
downloadgst-plugins-bad-e82812b2dc6bb8066e1c850e68e72c021b5edb33.tar.gz
gst-plugins-bad-e82812b2dc6bb8066e1c850e68e72c021b5edb33.tar.bz2
gst-plugins-bad-e82812b2dc6bb8066e1c850e68e72c021b5edb33.zip
configure.ac: Really check for libdc1394 >= 2.0.0, pkg-config thinks that 2.0.0-rcX is newer than 2.0.0 so we check f...
Original commit message from CVS: * configure.ac: Really check for libdc1394 >= 2.0.0, pkg-config thinks that 2.0.0-rcX is newer than 2.0.0 so we check for this too.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac9
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3871dd5a..562adf95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-07 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ Really check for libdc1394 >= 2.0.0, pkg-config thinks that
+ 2.0.0-rcX is newer than 2.0.0 so we check for this too.
+
2008-03-05 David Schleef <ds@schleef.org>
* ext/dirac/gstdiracenc.cc: Add a bunch of properties cribbed
diff --git a/configure.ac b/configure.ac
index 66e6e1b4..16aa5ea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,7 +355,14 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
dnl *** dc1394 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true)
AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [
- PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.0, HAVE_DC1394="yes", [
+ PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.0, [
+ if test -z "`pkg-config --modversion libdc1394-2 | grep 2.0.0-rc`"; then
+ HAVE_DC1394="yes"
+ else
+ HAVE_DC1394="no"
+ AC_MSG_RESULT(no)
+ fi
+ ], [
HAVE_DC1394="no"
AC_MSG_RESULT(no)
])