From 071967eaddebe93a5d54ef8a8a19153bce5d0b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 13 Jul 2006 12:24:58 +0000 Subject: 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. --- ChangeLog | 5 +++++ configure.ac | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1aedc560..f8ef5205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-13 Tim-Philipp Müller + + * configure.ac: + Don't error out in configure if mjpegtools dev is not there. + 2006-07-13 Tim-Philipp Müller Patch by: Mark Nauwelaerts 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 ]) -- cgit v1.2.1