From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 15 Feb 2011 16:24:12 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev
X-Git-Tag: 174~255
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4cbe7095226e0e4a050ef347ddc297386a571557;hp=-c;p=elogind.git

Merge branch 'master' of git+ssh:///linux/hotplug/udev
---

4cbe7095226e0e4a050ef347ddc297386a571557
diff --combined configure.ac
index b5754f2ac,c7885b016..caeb74131
--- a/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
 -AC_INIT([udev], [166], [linux-hotplug@vger.kernel.org])
 +AC_INIT([udev], [167], [linux-hotplug@vger.kernel.org])
  AC_PREREQ(2.60)
  AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@@ -118,6 -118,9 +118,9 @@@ if test "x$enable_extras" = xyes; the
  fi
  AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
  
+ AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
+ AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
+ 
  AC_ARG_ENABLE([introspection],
  	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
  	[], [enable_introspection=yes])