[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kdetv
From:       Dirk Ziegelmeier <dziegel () gmx ! de>
Date:       2005-05-18 19:40:11
Message-ID: 1116445211.030352.25217.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 415511 by dziegel:

Simplify check for V4L presence - if Linux is found, compile v4l stuff.
kdetv ships its own v4l headers, so we should have no compile problems.


 M  +5 -1      trunk/extragear/multimedia/kdetv/kvideoio/Makefile.am  
 M  +3 -8      trunk/extragear/multimedia/kdetv/plugins/video/configure.in.in  


--- trunk/extragear/multimedia/kdetv/kvideoio/Makefile.am #415510:415511
@@ -6,8 +6,12 @@
 #
 # Library
 #
-libkvideoio_la_SOURCES = kxv.cpp qvideostream.cpp v4ldev.cpp v4ldevtuner.cpp \
v4ldevcamera.cpp v4l2dev.cpp qvideo.cpp +if include_kdetvvideo
+V4L_SOURCES = v4ldev.cpp v4ldevtuner.cpp v4ldevcamera.cpp v4l2dev.cpp
+endif
 
+libkvideoio_la_SOURCES = kxv.cpp qvideostream.cpp qvideo.cpp $(V4L_SOURCES)
+
 libkvideoio_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libkvideoio_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(KDETV_LIBS) $(GLLIB)
 
--- trunk/extragear/multimedia/kdetv/plugins/video/configure.in.in #415510:415511
@@ -1,14 +1,9 @@
 have_v4l=no
 
 case "$host" in
-  *-*-linux*) kdetvv4l_compile=yes
-	AC_CHECK_HEADER(linux/videodev.h,
-			AC_DEFINE(HAVE_V4L, 1, [If we have video4linux])
-			have_v4l=yes
-			,,)
-	if test "$have_v4l" = "no"; then
-		kdetvv4l_compile=no
-	fi
+  *-*-linux*)
+    kdetvv4l_compile=yes
+	have_v4l=yes
   ;;
   *) kdetvv4l_compile=no;;
 esac


[prev in list] [next in list] [prev in thread] [next in thread]