summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aa6aefc)
raw | patch | inline | side by side (parent: aa6aefc)
author | Nikhil Devshatwar <nikhil.nd@ti.com> | |
Thu, 5 Dec 2013 22:15:29 +0000 (03:45 +0530) | ||
committer | Amarinder Bindra <a-bindra@ti.com> | |
Wed, 11 Dec 2013 06:25:26 +0000 (11:55 +0530) |
Fixed configure.ac picking host machine kernel headers problem
Using AC_CHECK_HEADERS for this
Removing check for struct member to check support for dmabuf
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Using AC_CHECK_HEADERS for this
Removing check for struct member to check support for dmabuf
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Makefile.am | patch | blob | history | |
configure.ac | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index 70472509504691b4648c39b48188c64fe820d17a..19cfa05ca8064295c24a3816f45ed96c61104897 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
bin_PROGRAMS = fliptest v4l2capturedisplay
if ENABLE_V4L2_DMABUF
-#bin_PROGRAMS += dmabuftest
+bin_PROGRAMS += dmabuftest
endif
if ENABLE_DCE
v4l2capturedisplay_LDADD = $(LDADD_COMMON)
if ENABLE_V4L2_DMABUF
-#dmabuftest_SOURCES = dmabuftest.c
-#dmabuftest_LDADD = $(LDADD_COMMON)
+dmabuftest_SOURCES = dmabuftest.c
+dmabuftest_LDADD = $(LDADD_COMMON)
endif
if ENABLE_DCE
diff --git a/configure.ac b/configure.ac
index 679375f07c8e934806ba884c58b773ed7f7560fd..c02673315c8d66dae4db5404ed8992f71274b772 100644 (file)
--- a/configure.ac
+++ b/configure.ac
PKG_CHECK_MODULES(DRM, libdrm libdrm_omap)
# Check for kernel headers
-kversion=`uname -r`
-AC_ARG_WITH([kernel-source],
- [AS_HELP_STRING([--with-kernel-source],
- [specify path to linux kernel source])],
- [kernel_source="$with_kernel_source"],
- [kernel_source="/usr/src/linux-headers-$kversion"])
-
-if test -r "$kernel_source/include/linux/videodev2.h"; then
- headers_cflags="$headers_cflags -I$kernel_source/include"
-
- AC_SUBST(LIN_CFLAGS, [$headers_cflags])
- AC_MSG_NOTICE([$kversion provides videodev2.h])
-else
- AC_MSG_NOTICE([Could not find $kernel_source/include/linux/videodev2.h])
-fi
-
-# Check for v4l2 dmabuf support:
-AC_CHECK_MEMBER([struct v4l2_buffer.m.fd],
+AC_CHECK_HEADER([linux/videodev2.h],
[HAVE_V4L2_DMABUF=yes],
[HAVE_V4L2_DMABUF=no],
[[#include <linux/videodev2.h>]])
+
if test "x$HAVE_V4L2_DMABUF" = "xyes"; then
AC_DEFINE(HAVE_V4L2_DMABUF, 1, [Have V4L2 DMABUF support])
- AC_MSG_NOTICE([V4L2 DMABUF support detected])
+ AC_MSG_NOTICE([V4L2 DMABUF support detected, building V4L2 DMABUF tests])
else
AC_MSG_WARN([No V4L2 DMABUF support detected, disabling V4L2 DMABUF tests])
fi