diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-07-13 12:24:58 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-07-13 12:24:58 +0000 |
| commit | 071967eaddebe93a5d54ef8a8a19153bce5d0b86 (patch) | |
| tree | c675dce767ef26d8b483b5502e7b2149b23e4f53 | |
| parent | 676eafc77c2799521925d54ba43b26df72c76b14 (diff) | |
| download | gst-plugins-bad-071967eaddebe93a5d54ef8a8a19153bce5d0b86.tar.gz gst-plugins-bad-071967eaddebe93a5d54ef8a8a19153bce5d0b86.tar.bz2 gst-plugins-bad-071967eaddebe93a5d54ef8a8a19153bce5d0b86.zip | |
configure.ac: Don't error out in configure if mjpegtools dev is not there.
Original commit message from CVS:
* configure.ac:
Don't error out in configure if mjpegtools dev is not there.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2006-07-13 Tim-Philipp Müller <tim at centricular dot net> + * configure.ac: + Don't error out in configure if mjpegtools dev is not there. + +2006-07-13 Tim-Philipp Müller <tim at centricular dot net> + Patch by: Mark Nauwelaerts <manauw at skynet be> * configure.ac: diff --git a/configure.ac b/configure.ac index d8328aae..cbb09f50 100644 --- a/configure.ac +++ b/configure.ac @@ -560,9 +560,9 @@ GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [ dnl libmpeg2enc was first included in mjpegtools-1.6.2-rc3 (1.6.1.92) dnl since many distros include mjpegtools specifically without mplex dnl and mpeg2enc, we check for mpeg2enc on its own, too. - dnl HACK because mpeg2enc 1.8.0 header files have a spurious 'include config.h' - touch config.h PKG_CHECK_MODULES(MPEG2ENC, mjpegtools >= 1.6.1.93, [ + dnl HACK because mpeg2enc 1.8.0 header files have a spurious 'include config.h' + touch config.h dnl switch over to c++ to test things AC_LANG_CPLUSPLUS OLD_CPPFLAGS="$CPPFLAGS" @@ -616,6 +616,8 @@ GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [ CPPFLAGS="$OLD_CPPFLAGS" AC_LANG_C + ], [ + HAVE_MPEG2ENC="no" ]) fi ]) |