diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-27 07:32:19 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-27 07:32:19 +0000 |
| commit | 5b791c2ce5b905e8a0521732dc9c08f85551520d (patch) | |
| tree | 39d56595dfc1a6e419d75890d09455e6d62a817c /configure.ac | |
| parent | 1a787a0cb2fb2afa3bd7aa21ffac1465130699c2 (diff) | |
| download | gst-plugins-bad-5b791c2ce5b905e8a0521732dc9c08f85551520d.tar.gz gst-plugins-bad-5b791c2ce5b905e8a0521732dc9c08f85551520d.tar.bz2 gst-plugins-bad-5b791c2ce5b905e8a0521732dc9c08f85551520d.zip | |
Add support for building against mjpegtools 1.9 while keeping compatiblity with older versions.
Original commit message from CVS:
Based on a patch by:
Hans de Goede <j dot w dot r dot degoede at hhs dot nl>
* configure.ac:
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.hh:
Add support for building against mjpegtools 1.9 while keeping
compatiblity with older versions.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f2477cef..ce8e3a9d 100644 --- a/configure.ac +++ b/configure.ac @@ -676,7 +676,14 @@ AC_SUBST(LIBMMS_LIBS) dnl *** mjpegtools version info *** dnl some may prefer older version (given quirks above) dnl hm, no version info seems available within mjpegtools headers -PKG_CHECK_EXISTS(mjpegtools >= 1.8.0 mjpegtools < 1.9.0, [ + +PKG_CHECK_EXISTS(mjpegtools >= 1.9.0 mjpegtools < 1.10.0, [ + AC_DEFINE(GST_MJPEGTOOLS_19x, 1, [mjpegtools >= 1.9.0 is used]) + have_mpjegtools_19x=yes + ], [ + have_mpjegtools_19x=no]) + +PKG_CHECK_EXISTS(mjpegtools >= 1.8.0, [ AC_DEFINE(GST_MJPEGTOOLS_18x, 1, [mjpegtools >= 1.8.0 is used]) have_mpjegtools_18x=yes ], [ @@ -732,7 +739,10 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [ ], [ mpeg2enc_headers_ok=no ]) + else + mpeg2enc_headers_ok=yes fi + if test "x$mpeg2enc_headers_ok" = "xyes"; then HAVE_MPEG2ENC="yes" fi |