diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-11-13 01:52:56 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-11-13 01:53:46 +0100 |
| commit | 56484e2a730772015af966860f220867a2f0b580 (patch) | |
| tree | dd2a34abb2445888d66480895d729396081bdcfa /kopete/libkopete | |
| parent | 1f93335507d8bf855393527ff2a2802b47418075 (diff) | |
| download | tdenetwork-56484e2a730772015af966860f220867a2f0b580.tar.gz tdenetwork-56484e2a730772015af966860f220867a2f0b580.zip | |
Kopete: Improve check for videodev header
This resolves bug 2725
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c7ed96db836509bfc933c2be08dcbd63dff54589)
Diffstat (limited to 'kopete/libkopete')
| -rw-r--r-- | kopete/libkopete/avdevice/configure.in.in | 43 | ||||
| -rw-r--r-- | kopete/libkopete/avdevice/videocontrol.h | 4 | ||||
| -rw-r--r-- | kopete/libkopete/avdevice/videodevice.h | 10 |
3 files changed, 6 insertions, 51 deletions
diff --git a/kopete/libkopete/avdevice/configure.in.in b/kopete/libkopete/avdevice/configure.in.in deleted file mode 100644 index 4a446c03..00000000 --- a/kopete/libkopete/avdevice/configure.in.in +++ /dev/null @@ -1,43 +0,0 @@ -# -- Check for libv4l1-videodev.h presence -------------------- - -AC_MSG_CHECKING([for libv4l1-videodev.h]) - -AC_TRY_COMPILE([ -#include <libv4l1-videodev.h> -], -[ -], - ac_have_libv4l1_videodev_h=yes -, - ac_have_libv4l1_videodev_h=no -) - -if test $ac_have_libv4l1_videodev_h = yes; then - AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed]) -fi - -AC_MSG_RESULT($ac_have_libv4l1_videodev_h) - -# -- End libv4l1-videodev.h ---------------------------------------------- - -# -- Check for installed videodev headers -------------------- - -AC_MSG_CHECKING([for videodev.h]) - -AC_TRY_COMPILE([ -#include <linux/videodev.h> -], -[ -], - ac_have_videodev_h=yes -, - ac_have_videodev_h=no -) - -if test $ac_have_videodev_h = yes; then - AC_DEFINE(HAVE_LINUX_VIDEODEV_H, 1, [Define if you have videodev.h installed]) -fi - -AC_MSG_RESULT($ac_have_videodev_h) - -# -- End videodev ---------------------------------------------- diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h index e2d89756..af6b5138 100644 --- a/kopete/libkopete/avdevice/videocontrol.h +++ b/kopete/libkopete/avdevice/videocontrol.h @@ -21,8 +21,8 @@ #if defined HAVE_CONFIG_H #include <config.h> #endif -#if defined HAVE_LINUX_VIDEODEV_H -#include <linux/videodev.h> +#if defined VIDEODEV_HEADER +#include VIDEODEV_HEADER #endif #if defined(__linux__) #include <asm/types.h> diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index dd9047c9..970f6655 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -35,8 +35,8 @@ #if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) -#if defined HAVE_LINUX_VIDEODEV_H -#include <linux/videodev.h> +#if defined VIDEODEV_HEADER +#include VIDEODEV_HEADER #endif #if defined(__linux__) #include <asm/types.h> @@ -59,10 +59,8 @@ #include <linux/fs.h> #include <linux/kernel.h> #endif -#if defined(HAVE_LIBV4L1_VIDEODEV_H) -#include <libv4l1-videodev.h> -#elif defined(HAVE_LINUX_VIDEODEV_H) -#include <linux/videodev.h> +#if defined(VIDEODEV_HEADER) +#include VIDEODEV_HEADER #else #undef ENABLE_AV #endif |