[MPlayer-cvslog] CVS: main configure,1.1054,1.1055

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv30787

Modified Files:
	configure 
Log Message:
- remove useless /dev/video* checks
- add a proper configure check for v4l2
- prepare for videodev2.h removal


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -r1.1054 -r1.1055
--- configure	10 Sep 2005 18:23:40 -0000	1.1054
+++ configure	10 Sep 2005 18:38:21 -0000	1.1055
@@ -6370,17 +6370,13 @@
 if test "$_tv_v4l" = auto ; then
  _tv_v4l=no
  if test "$_tv" = yes && linux ; then
-  for I in /dev/video /dev/video? ; do
-    if test -c $I ; then
-      cat > $TMPC <<EOF
+  cat > $TMPC <<EOF
 #include <stdlib.h>
 #include <linux/videodev.h>
 int main(void) { return 0; }
 EOF
-      cc_check && _tv_v4l=yes
-      break
-    fi
-  done
+  cc_check && _tv_v4l=yes
+  break
  fi
 fi
 if test "$_tv_v4l" = yes ; then
@@ -6397,12 +6393,14 @@
 if test "$_tv_v4l2" = auto ; then
  _tv_v4l2=no
  if test "$_tv" = yes && linux ; then
-  for I in /dev/video /dev/video? ; do
-    if test -c $I ; then
-      _tv_v4l2=yes
-      break
-    fi
-  done
+  cat > $TMPC <<EOF
+#include <stdlib.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
+int main(void) { return 0; }
+EOF
+  cc_check && _tv_v4l2=yes
+  break
  fi
 fi
 if test "$_tv_v4l2" = yes ; then