From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 15 Feb 2011 13:20:21 +0000 (+0100)
Subject: Only build v4l_id if V4L1 header file is available
X-Git-Tag: 174~255^2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0c0b3f97cad4c34140dda3aa85a9bc74badb4b16

Only build v4l_id if V4L1 header file is available
---

diff --git a/Makefile.am b/Makefile.am
index df426f72a..b87741802 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -312,10 +312,12 @@ 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
 
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
diff --git a/configure.ac b/configure.ac
index 9d35cfced..2ceba5619 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,9 @@ 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])