Fix kstars not detecting videodev2.h

This resolves Bug 1372
pull/1/head
Timothy Pearson 10 years ago
parent c2c964bb41
commit ab9a2a8b5e
  1. 13
      kstars/configure.in.in
  2. 2
      kstars/kstars/indi/v4lphilips.h
  3. 4
      kstars/kstars/indi/webcam/v4l1_base.h
  4. 4
      kstars/kstars/indi/webcam/v4l1_pwc.h

@ -87,7 +87,18 @@ case "$target" in
[have_v4l2=true],
[have_v4l2=false],
[#include <sys/time.h>
#include <linux/videodev.h>])
#include <linux/videodev2.h>])
if test x$have_v4l2 = xfalse; then
unset ac_cv_type_struct_v4l2_buffer
AC_CHECK_TYPE([struct v4l2_buffer],
[have_v4l2=true],
[have_v4l2=false],
[#include <sys/time.h>
#include <linux/videodev.h>])
if test x$have_v4l2 = xtrue; then
AC_DEFINE(HAVE_LINUX_ALTERNATE_VIDEODEV_H, 1, [Define to 1 if you have the <linux/videodev.h> header file.])
fi
fi
if test x$have_v4l2 = xfalse; then
KERNEL_VERSION=`uname -r`
AC_CHECK_FILE(/lib/modules/$KERNEL_VERSION/build/include/linux/videodev2.h,

@ -20,6 +20,8 @@
*/
#include <config.h>
#ifndef HAVE_LINUX_VIDEODEV2_H
#include "webcam/v4l1_pwc.h"
#endif

@ -24,7 +24,11 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_LINUX_ALTERNATE_VIDEODEV_H
#include "videodev.h"
#else
#include "videodev2.h"
#endif
#include "../eventloop.h"
class V4L1_Base

@ -23,7 +23,11 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_LINUX_ALTERNATE_VIDEODEV_H
#include "videodev.h"
#else
#include "videodev2.h"
#endif
#include "v4l1_base.h"
class V4L1_PWC : public V4L1_Base

Loading…
Cancel
Save