chiark / gitweb /
v4l_id: Drop videodev.h check again
authorMartin Pitt <martin.pitt@ubuntu.com>
Tue, 15 Feb 2011 16:33:05 +0000 (17:33 +0100)
committerMartin Pitt <martin.pitt@ubuntu.com>
Tue, 15 Feb 2011 16:33:05 +0000 (17:33 +0100)
It only uses v4l2 now.

Makefile.am
configure.ac

index eb8f6d1..a0967ab 100644 (file)
@@ -313,12 +313,10 @@ libexec_PROGRAMS += extras/usb_id/usb_id
 # ------------------------------------------------------------------------------
 # v4l_id - video4linux capabilities
 # ------------------------------------------------------------------------------
-if HAVE_V4L1
 extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
 extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
-endif
 
 endif # ENABLE_EXTRAS
 
index caeb741..b5754f2 100644 (file)
@@ -118,9 +118,6 @@ if test "x$enable_extras" = xyes; then
 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])