diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 24 |
2 files changed, 25 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + Patch by: Alexandre Rostovtsev <tetromino at gmail dot com> + + * configure.ac: + Make usage of libv4l optional by a configure parameter. + Fixes bug #563504. + 2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk> * docs/plugins/Makefile.am: diff --git a/configure.ac b/configure.ac index c7e0c9a0..473a7aaa 100644 --- a/configure.ac +++ b/configure.ac @@ -550,14 +550,24 @@ return 0; fi ]) +# Make libv4l2 non-automagic +AC_ARG_WITH([libv4l2], + AC_HELP_STRING([--with-libv4l2], + [support video buffer conversion using libv4l2]), + [], + [with_libv4l2=check]) if test x$HAVE_GST_V4L2 = xyes; then - PKG_CHECK_MODULES(LIBV4L2, libv4l2, - [ have_libv4l2=yes - AC_DEFINE(HAVE_LIBV4L2, 1, - [Whether libv4l2 is available for video buffer conversion]) - ], [ - have_libv4l2=no - ]) + if test x$with_libv4l2 != xno; then + PKG_CHECK_MODULES(LIBV4L2, libv4l2, + [ have_libv4l2=yes + AC_DEFINE(HAVE_LIBV4L2, 1, + [Whether libv4l2 is available for video buffer conversion]) + ], [ + have_libv4l2=no + ]) + else + have_libv4l2=no + fi fi dnl Check for X11 |