From e82812b2dc6bb8066e1c850e68e72c021b5edb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 7 Mar 2008 13:28:06 +0000 Subject: 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. --- ChangeLog | 6 ++++++ configure.ac | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3871dd5a..562adf95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-07 Sebastian Dröge + + * 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 * 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) ]) -- cgit v1.2.1