Attachment #2741 for bug #2725

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2725
Collapse All | Expand All

Lines 6-11 Link Here

(-)a/config.h.cmake (+3 lines)
6	// for other OSes can be necessary to check	6	// for other OSes can be necessary to check
7	#define STDC_HEADERS 1	7	#define STDC_HEADERS 1
8		8
		9	// kopete (libkopete/avdevice and plugins/motionautoaway)
		10	#cmakedefine VIDEODEV_HEADER "@VIDEODEV_HEADER@"
		11
9	// kopete/protocols/yahoo	12	// kopete/protocols/yahoo
10	#cmakedefine HAVE_STRINGS_H 1	13	#cmakedefine HAVE_STRINGS_H 1
11		14




  endif( )
endif( )

# -- Check for libv4l1-videodev.h presence --------------------
CHECK_INCLUDE_FILE ( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
if ( HAVE_LIBV4L1_VIDEODEV_H )
  add_definitions( -DHAVE_LIBV4L1_VIDEODEV_H )
endif ( )
# -- End libv4l1-videodev.h ----------------------------------------------

### Check for videodev header
check_include_file( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
if( HAVE_LIBV4L1_VIDEODEV_H )
  set( VIDEODEV_HEADER "libv4l1-videodev.h" CACHE INTERNAL "" )
else( )
  check_include_file( "linux/videodev.h" HAVE_VIDEODEV_H )
  if( HAVE_VIDEODEV_H )
    set( VIDEODEV_HEADER "linux/videodev.h" CACHE INTERNAL "" )
  else( )
    if( BUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY )
      tde_message_fatal( "libv4l1-videodev.h or linux/videodev.h is required, but not found on your system" )
    endif( BUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY )
  endif( )
endif( )


### Check for tm_gmtoff in tm struct
check_struct_has_member( "struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF )




AC_SUBST(KOPETE_COMPAT_INCLUDES)
AC_SUBST(LIB_KOPETECOMPAT)


KDE_CHECK_HEADERS(
	[libv4l1-videodev.h],
	[videodev_header="libv4l1-videodev.h"],
	[
	    KDE_CHECK_HEADERS([linux/videodev.h],
	     [videodev_header="linux/videodev.h"],
	     [videodev_header="no"])
	])
if test ! x$videodev_header = xno; then
    AC_DEFINE_UNQUOTED(VIDEODEV_HEADER, ["$videodev_header"], [Define header name for videodev])
fi

# -- Check for installed Valgrind headers --------------------

AC_MSG_CHECKING([for valgrind.h])




# -- 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 ----------------------------------------------

Lines 21-28 Link Here

(-)a/kopete/libkopete/avdevice/videocontrol.h (-2 / +2 lines)
21	#if defined HAVE_CONFIG_H	21	#if defined HAVE_CONFIG_H
22	#include <config.h>	22	#include <config.h>
23	#endif	23	#endif
24	#if defined HAVE_LINUX_VIDEODEV_H	24	#if defined VIDEODEV_HEADER
25	#include <linux/videodev.h>	25	#include VIDEODEV_HEADER
26	#endif	26	#endif
27	#if defined(__linux__)	27	#if defined(__linux__)
28	#include <asm/types.h>	28	#include <asm/types.h>





#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)

#if defined VIDEODEV_HEADER
#include VIDEODEV_HEADER
#endif
#if defined(__linux__)
#include <asm/types.h>

#include <linux/fs.h>
#include <linux/kernel.h>
#endif
#if defined(VIDEODEV_HEADER)
#include VIDEODEV_HEADER
#elif defined(HAVE_LINUX_VIDEODEV_H)
#include <linux/videodev.h>
#else
#undef ENABLE_AV
#endif

Lines 52-62 Link Here

(-)a/kopete/plugins/motionautoaway/motionawayplugin.cpp (-5 / +1 lines)
52	#endif	52	#endif
53	#endif	53	#endif
54		54
55	#ifdef HAVE_LIBV4L1_VIDEODEV_H	55	#include VIDEODEV_HEADER
56	#include <libv4l1-videodev.h>
57	#else
58	#include <linux/videodev.h>
59	#endif
60		56
61	#define DEF_WIDTH 352	57	#define DEF_WIDTH 352
62	#define DEF_HEIGHT 288	58	#define DEF_HEIGHT 288

Return to bug 2725

Lines 136-141 AC_SUBST(KOPETE_INCLUDES) Link Here

(-)a/kopete/configure.in.in (+13 lines)
136	AC_SUBST(KOPETE_COMPAT_INCLUDES)	136	AC_SUBST(KOPETE_COMPAT_INCLUDES)
137	AC_SUBST(LIB_KOPETECOMPAT)	137	AC_SUBST(LIB_KOPETECOMPAT)
138		138
		139
		140	KDE_CHECK_HEADERS(
		141	[libv4l1-videodev.h],
		142	[videodev_header="libv4l1-videodev.h"],
		143	[
		144	KDE_CHECK_HEADERS([linux/videodev.h],
		145	[videodev_header="linux/videodev.h"],
		146	[videodev_header="no"])
		147	])
		148	if test ! x$videodev_header = xno; then
		149	AC_DEFINE_UNQUOTED(VIDEODEV_HEADER, ["$videodev_header"], [Define header name for videodev])
		150	fi
		151
139	# -- Check for installed Valgrind headers --------------------	152	# -- Check for installed Valgrind headers --------------------
140		153
141	AC_MSG_CHECKING([for valgrind.h])	154	AC_MSG_CHECKING([for valgrind.h])

Lines 19-37 if( BUILD_KOPETE_PROTOCOL_JABBER AND WITH_JINGLE ) Link Here

(-)a/kopete/ConfigureChecks.cmake (-12 / +15 lines)
19	endif( )	19	endif( )
20	endif( )	20	endif( )
21		21
22	# -- Check for libv4l1-videodev.h presence --------------------
23	CHECK_INCLUDE_FILE ( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
24	if ( HAVE_LIBV4L1_VIDEODEV_H )
25	add_definitions( -DHAVE_LIBV4L1_VIDEODEV_H )
26	endif ( )
27	# -- End libv4l1-videodev.h ----------------------------------------------
28		22
29	# -- Check for linux/videodev.h presence --------------------	23	### Check for videodev header
30	CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )	24	check_include_file( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
31	if ( HAVE_LINUX_VIDEODEV_H )	25	if( HAVE_LIBV4L1_VIDEODEV_H )
32	add_definitions( -DHAVE_LINUX_VIDEODEV_H )	26	set( VIDEODEV_HEADER "libv4l1-videodev.h" CACHE INTERNAL "" )
33	endif ( )	27	else( )
34	# -- End linux-videodev.h ----------------------------------------------	28	check_include_file( "linux/videodev.h" HAVE_VIDEODEV_H )
		29	if( HAVE_VIDEODEV_H )
		30	set( VIDEODEV_HEADER "linux/videodev.h" CACHE INTERNAL "" )
		31	else( )
		32	if( BUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY )
		33	tde_message_fatal( "libv4l1-videodev.h or linux/videodev.h is required, but not found on your system" )
		34	endif( BUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY )
		35	endif( )
		36	endif( )
		37
35		38
36	### Check for tm_gmtoff in tm struct	39	### Check for tm_gmtoff in tm struct
37	check_struct_has_member( "struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF )	40	check_struct_has_member( "struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF )

Lines 1-43 Link Here

(-)a/kopete/libkopete/avdevice/configure.in.in (-43 lines)
1	# -- Check for libv4l1-videodev.h presence --------------------
2
3	AC_MSG_CHECKING([for libv4l1-videodev.h])
4
5	AC_TRY_COMPILE([
6	#include <libv4l1-videodev.h>
7	],
8	[
9	],
10	ac_have_libv4l1_videodev_h=yes
11	,
12	ac_have_libv4l1_videodev_h=no
13	)
14
15	if test $ac_have_libv4l1_videodev_h = yes; then
16	AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed])
17	fi
18
19	AC_MSG_RESULT($ac_have_libv4l1_videodev_h)
20
21	# -- End libv4l1-videodev.h ----------------------------------------------
22
23	# -- Check for installed videodev headers --------------------
24
25	AC_MSG_CHECKING([for videodev.h])
26
27	AC_TRY_COMPILE([
28	#include <linux/videodev.h>
29	],
30	[
31	],
32	ac_have_videodev_h=yes
33	,
34	ac_have_videodev_h=no
35	)
36
37	if test $ac_have_videodev_h = yes; then
38	AC_DEFINE(HAVE_LINUX_VIDEODEV_H, 1, [Define if you have videodev.h installed])
39	fi
40
41	AC_MSG_RESULT($ac_have_videodev_h)
42
43	# -- End videodev ----------------------------------------------

Lines 35-42 Link Here

(-)a/kopete/libkopete/avdevice/videodevice.h (-6 / +4 lines)
35		35
36	#if (defined(__linux__) \|\| defined(__FreeBSD__)) && defined(ENABLE_AV)	36	#if (defined(__linux__) \|\| defined(__FreeBSD__)) && defined(ENABLE_AV)
37		37
38	#if defined HAVE_LINUX_VIDEODEV_H	38	#if defined VIDEODEV_HEADER
39	#include <linux/videodev.h>	39	#include VIDEODEV_HEADER
40	#endif	40	#endif
41	#if defined(__linux__)	41	#if defined(__linux__)
42	#include <asm/types.h>	42	#include <asm/types.h>
Lines 59-68 Link Here
59	#include <linux/fs.h>	59	#include <linux/fs.h>
60	#include <linux/kernel.h>	60	#include <linux/kernel.h>
61	#endif	61	#endif
62	#if defined(HAVE_LIBV4L1_VIDEODEV_H)	62	#if defined(VIDEODEV_HEADER)
63	#include <libv4l1-videodev.h>	63	#include VIDEODEV_HEADER
64	#elif defined(HAVE_LINUX_VIDEODEV_H)
65	#include <linux/videodev.h>
66	#else	64	#else
67	#undef ENABLE_AV	65	#undef ENABLE_AV
68	#endif	66	#endif