summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-29 20:31:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-29 20:31:51 +0000
commit4c7c543902cc8bd03c6a2ded06f27d6b93cf1316 (patch)
treeb9b4e44d799a568f62a0da2ba5d0b9f82a4a85c9
parentd0be1721b4656109c9e21cc0ecb6f23b343b7c26 (diff)
downloadtdenetwork-4c7c543902cc8bd03c6a2ded06f27d6b93cf1316.tar.gz
tdenetwork-4c7c543902cc8bd03c6a2ded06f27d6b93cf1316.zip
Use libv4l1-videodev.h when available in kdenetwork
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1243951 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kopete/libkopete/avdevice/configure.in.in21
-rw-r--r--kopete/libkopete/avdevice/videodevice.h4
2 files changed, 25 insertions, 0 deletions
diff --git a/kopete/libkopete/avdevice/configure.in.in b/kopete/libkopete/avdevice/configure.in.in
new file mode 100644
index 00000000..34dd7523
--- /dev/null
+++ b/kopete/libkopete/avdevice/configure.in.in
@@ -0,0 +1,21 @@
+# -- 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 ----------------------------------------------
diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h
index 2482c183..7bba507e 100644
--- a/kopete/libkopete/avdevice/videodevice.h
+++ b/kopete/libkopete/avdevice/videodevice.h
@@ -52,7 +52,11 @@
#include <linux/fs.h>
#include <linux/kernel.h>
+#if defined(HAVE_LIBV4L1_VIDEODEV_H)
+#include <libv4l1-videodev.h>
+#else
#include <linux/videodev.h>
+#endif
#define VIDEO_MODE_PAL_Nc 3
#define VIDEO_MODE_PAL_M 4
#define VIDEO_MODE_PAL_N 5