summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2011-02-15 17:33:05 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2011-02-15 17:33:05 +0100
commitf3f70f8d9ef6a901bf1bdff10008d76e72bb6692 (patch)
treec8a4161ccfcf5ac52439e02075564fa1a1d762ef
parent89284ddac413d376fc3b56f742daaf1b9bc85bba (diff)
v4l_id: Drop videodev.h check again
It only uses v4l2 now.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
2 files changed, 0 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index eb8f6d197d..a0967ab207 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/configure.ac b/configure.ac
index caeb741319..b5754f2ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])