From a973a4f154d9e17ed6551f3511f6a2bdc38f580f Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Mon, 21 Jan 2008 19:35:58 +0000 Subject: configure.ac: Detect video4linux headers on Solaris too. Original commit message from CVS: * configure.ac: Detect video4linux headers on Solaris too. * sys/v4l2/gstv4l2colorbalance.h: * sys/v4l2/gstv4l2object.h: * sys/v4l2/v4l2_calls.c: * sys/v4l2/v4l2src_calls.c: (gst_v4l2_buffer_finalize), (gst_v4l2_buffer_new): Make v4l2 build on Solaris. Patch by: Brian Cameron Fixes: #510505 --- configure.ac | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d0153d0d..427fbf7b 100644 --- a/configure.ac +++ b/configure.ac @@ -473,10 +473,15 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [ AC_MSG_CHECKING([Checking for uptodate v4l2 installation]) AC_TRY_COMPILE([ #include +#ifdef __sun /* Solaris */ +#include +#include +#else /* Linux */ #include #define _LINUX_TIME_H #define __user #include +#endif #if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION) #error too early v4l2 version or no v4l2 at all #endif @@ -488,13 +493,19 @@ return 0; ], [ HAVE_GST_V4L2="no" AC_MSG_RESULT(no) - AC_CHECK_HEADER(linux/videodev2.h, + + HAVE_VIDEODEV=no + AC_CHECK_HEADER(linux/videodev2.h, [ HAVE_VIDEODEV=yes ], [ + AC_CHECK_HEADER(sys/videodev2.h, [ HAVE_VIDEODEV=yes ]) + ]) + + if test "x$HAVE_VIDEODEV" = "xyes"; then AC_MSG_WARN([video4linux2 headers were found, but they're old.]) AC_MSG_WARN([Please update v4l2 to compile the v4l2 plugins]) - ], [ + else AC_MSG_WARN([video4linux2 was not found]) - ]) + fi ]) if [ test x$HAVE_GST_V4L2 = xyes ]; then @@ -503,10 +514,15 @@ return 0; AC_MSG_CHECKING(struct v4l2_buffer declaration) AC_TRY_COMPILE([ #include +#ifdef __sun /* Solaris */ +#include +#include +#else /* Linux */ #include #define _LINUX_TIME_H #define __user #include +#endif ],[ struct v4l2_buffer buf; buf.index = 0; -- cgit