configure.ac: First check for "theoraenc theoradec" and if that failed check for...

Original commit message from CVS:
* configure.ac:
First check for "theoraenc theoradec" and if that failed check
for "theora >= 1.0alpha5". The former appeared in 1.0beta3 and
deprecate the latter. Also linking on Windows fails with just "theora"
and the version check would fail for the release candidates.
Fixes bug #563718.

diff --git a/ChangeLog b/ChangeLog
index 6b8c3144602bb33db291cf0f6b8d37686154ec0a..aea2bd01657811d30e2fe2ee52780c750297e93b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+2008-12-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       * configure.ac:
+       First check for "theoraenc theoradec" and if that failed check
+       for "theora >= 1.0alpha5". The former appeared in 1.0beta3 and
+       deprecate the latter. Also linking on Windows fails with just "theora"
+       and the version check would fail for the release candidates.
+       Fixes bug #563718.
+
 2008-12-08  Stefan Kost  <ensonic@users.sf.net>
 
        * gst/playback/gstdecodebin.c:
        * gst/playback/gstdecodebin2.c:
          Add basic docs to decodebin and link to decodebin from decodebin2.
          
-
 2008-12-08  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        Patch by: Olivier Crete  <tester at tester ca>

diff --git a/configure.ac b/configure.ac
index 4163ad3fe91448f6deca730a4ee709631aacb224..d924b4445602effd9560a04ce3883dcb618b7122 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -507,9 +507,14 @@ AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
 dnl *** theora ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
 AG_GST_CHECK_FEATURE(THEORA, [Xiph Theora video codec], theora, [
-  dnl this check will work as long as theora uses 1.0.x or similar for the
-  dnl first post-alpha release and not just 1.0
-  AG_GST_PKG_CHECK_MODULES(THEORA, theora >= 1.0alpha5)
+  dnl theora uses pkg-config version incorrectly, for pkg-config:
+  dnl 1.0 < 1.0RCX < 1.0alphaX < 1.0betaX < 1.0.0
+  dnl theoraenc and theoradec appeared in 1.0beta3
+
+  AG_GST_PKG_CHECK_MODULES(THEORA, theoradec theoraenc)
+  if test x$HAVE_THEORA = xno; then
+    AG_GST_PKG_CHECK_MODULES(THEORA, theora >= 1.0alpha5)
+  fi
 ])
 
 dnl *** vorbis ***