Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2ceba56191617bed5987406cdb2c39e073d50a8d..caeb741319890ed9482fd9e35538e7c8c596b570 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])])
@@ -115,12 +115,12 @@ if test "x$enable_extras" = xyes; then
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
        AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
-
-       AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
-       AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
 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])