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