From 9f2e7127dc338e3cc6287ab87caa2c0449290ec2 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gmail.com>
Date: Sun, 7 Dec 2008 19:01:35 +0000
Subject: [PATCH] configure.ac: Make usage of libv4l optional by a configure
 parameter.

Original commit message from CVS:
Patch by: Alexandre Rostovtsev <tetromino at gmail dot com>
* configure.ac:
Make usage of libv4l optional by a configure parameter.
Fixes bug #563504.
---
 ChangeLog    |  8 ++++++++
 configure.ac | 24 +++++++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a89797..5af8d98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 c7e0c9a..473a7aa 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
-- 
2.7.4