diff --git a/configure.ac b/configure.ac
index cf426df46c82054860f0c9de0a29ac450e223e63..c02673315c8d66dae4db5404ed8992f71274b772 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# Initialize libtool
AC_PROG_LIBTOOL
+AC_PROG_CXX
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(DRM, libdrm libdrm_omap)
# Check for kernel headers
-kversion=`uname -r`
-if test -r "/usr/src/linux-headers-$kversion/include/linux/videodev2.h"; then
- headers_cflags="$headers_cflags -I/usr/src/linux-headers-$kversion/include"
-
- AC_SUBST(CFLAGS, [$headers_cflags])
- AC_MSG_NOTICE([$kversion provides videodev2.h])
-else
- AC_MSG_NOTICE([Could not find /usr/src/linux-headers-$kversion/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
AM_CONDITIONAL(ENABLE_V4L2_DMABUF, [test "x$HAVE_V4L2_DMABUF" = xyes])
-# Check optional X11:
-PKG_CHECK_MODULES(X11, x11 dri2, [HAVE_X11=yes], [HAVE_X11=no])
-if test "x$HAVE_X11" = "xyes"; then
- AC_DEFINE(HAVE_X11, 1, [Have X11 support])
+# Check optional KMSCUBE:
+AC_ARG_ENABLE([kmscube], AS_HELP_STRING([--disable-kmscube], [disable kmscube display support]))
+AS_IF([test "x$enable_kmscube" != "xno"], [PKG_CHECK_EXISTS(gbm egl glesv2, [HAVE_KMSCUBE=yes], [HAVE_KMSCUBE=no])])
+if test "x$HAVE_KMSCUBE" = "xyes"; then
+ AC_DEFINE(HAVE_KMSCUBE, 1, [Have KMSCUBE support])
+ PKG_CHECK_MODULES(GBM, gbm)
+ PKG_CHECK_MODULES(EGL, egl)
+ PKG_CHECK_MODULES(GLES2, glesv2)
else
- AC_MSG_WARN([No X11 support detected, disabling X11 support])
+ AC_MSG_WARN([No KMSCUBE support detected, disabling KMSCUBE support])
fi
-AM_CONDITIONAL(ENABLE_X11, [test "x$HAVE_X11" = xyes])
+AM_CONDITIONAL(ENABLE_KMSCUBE, [test "x$HAVE_KMSCUBE" = xyes])
# Check for libdce and libav..
PKG_CHECK_MODULES(DCE, libdce libavformat libavutil, [HAVE_DCE=yes], [HAVE_DCE=no])
fi
AM_CONDITIONAL(ENABLE_DCE, [test "x$HAVE_DCE" = xyes])
+# Check for libdomx..
+PKG_CHECK_MODULES(DOMX, libdomx, [HAVE_DOMX=yes], [HAVE_DOMX=no])
+if test "x$HAVE_DOMX" = "xyes"; then
+ AC_DEFINE(HAVE_DOMX, 1, [Have DOMX support])
+ AC_MSG_NOTICE([Detected libdomx, building omx camera test])
+else
+ AC_MSG_WARN([No libdomx support detected, disabling omx camera test])
+fi
+AM_CONDITIONAL(ENABLE_DOMX, [test "x$HAVE_DOMX" = xyes])
+
dnl ===========================================================================
dnl check compiler flags
AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
AC_SUBST(WARN_CFLAGS)
-AC_CONFIG_FILES([Makefile util/Makefile])
+AC_CONFIG_FILES([Makefile omx_cam/Makefile util/Makefile])
AC_OUTPUT