Index: configure.ac
===================================================================
--- configure.ac	(revision 856)
+++ configure.ac	(revision 906)
@@ -456,5 +456,5 @@
         *) AC_MSG_ERROR(bad value ${enableval} for --disable-gsm) ;;
       esac],[gsm=true])
-
+      
 if test x$gsm = xtrue; then
 
@@ -559,12 +559,35 @@
 AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
 
+AC_ARG_ENABLE(libv4l,
+      [  --disable-libv4l    Disable usage of libv4l, really discouraged],
+      [case "${enableval}" in
+        yes) libv4l=true ;;
+        no)  libv4l=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-libv4l) ;;
+      esac],[libv4l=true])b
+
 PKG_CHECK_MODULES(LIBV4L2, libv4l2,
-	[AC_DEFINE(HAVE_LIBV4L2,1,[Defined if we have libv4l2])]
+	[AC_DEFINE(HAVE_LIBV4L2,1,[Defined if we have libv4l2])
+	have_libv4l2=yes]
 	,[echo "No libv4l2 found."]
 )
 PKG_CHECK_MODULES(LIBV4L1, libv4l1,
-	[AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])]
+	[AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])
+	have_libv4l1=yes]
 	,[echo "No libv4l1 found."]
 )
+
+if test "$found_v4l" = "yes" && test "$have_libv4l2" != "yes" ; then
+	if test "$libv4l" = "no" ; then
+		AC_MSG_ERROR(
+[
+Missing libv4l2. It is highly recommended to build with
+libv4l2 headers and library. Many camera will won't work or will crash
+your application if libv4l2 is not installed.
+If you know what you are doing, you can use --disable-libv4l to disable
+this check.
+])
+	fi
+fi
 
 dnl ##################################################