[Openh323-cvs] pwlib/plugins configure.in,1.7,1.8 configure,1.4,1.5 Makefile.in,1.5,1.6

[Damien S. <dsa...@us...>]

Update of /cvsroot/openh323/pwlib/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15397

Modified Files:
	configure.in configure Makefile.in 
Log Message:
Added the V4L2 plugin to the build if requested by configure.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/openh323/pwlib/plugins/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	17 Dec 2003 15:40:56 -0000	1.5
--- Makefile.in	21 Sep 2004 12:55:08 -0000	1.6
***************
*** 32,35 ****
--- 32,44 ----
  endif
  
+ HAS_V4L2	= @HAS_V4L2@
+ 
+ ifeq (1,$(HAS_V4L2))
+ SUBDIRS += vidinput_v4l2
+ ifeq (,$(DEFAULT_VIDINPUT))
+ DEFAULT_VIDINPUT	= vidinput_v4l2
+ endif
+ endif
+ 
  HAS_BSDVIDEOCAP		= @HAS_BSDVIDEOCAP@
  

Index: configure
===================================================================
RCS file: /cvsroot/openh323/pwlib/plugins/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	15 Jun 2004 23:55:50 -0000	1.4
--- configure	21 Sep 2004 12:55:08 -0000	1.5
***************
*** 1,8 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57.
  #
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
  #! /bin/sh
[...3346 lines suppressed...]
! 	   echo "$f"
! 	 elif test -f "$srcdir/$f"; then
! 	   # Source tree
! 	   echo "$srcdir/$f"
! 	 else
! 	   # /dev/null tree
! 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
! 	 fi;;
        esac
      done` || { (exit 1); exit 1; }
+ 
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF

Index: configure.in
===================================================================
RCS file: /cvsroot/openh323/pwlib/plugins/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in	15 Jun 2004 23:55:50 -0000	1.7
--- configure.in	21 Sep 2004 12:55:08 -0000	1.8
***************
*** 85,88 ****
--- 85,105 ----
  
  dnl #########################################################################
+ dnl check for V4L2 video support
+ dnl ########################################################################
+ 
+ AC_ARG_ENABLE(v4l2, [  --enable-v4l2            enable V4L2 video support],,enable_v4l2=no)
+ 
+ if test "$enable_v4l2" = "yes" ; then
+   AC_CHECK_HEADER(linux/videodev2.h, V4L2HDR=1)
+   AC_MSG_CHECKING(for V4L2 video support)
+   if test "${V4LHDR:-unset}" != "unset"; then
+     AC_SUBST(HAS_V4L2, 1)
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(no)
+   fi
+ fi
+ 
+ dnl #########################################################################
  dnl check for BSD video capture support
  dnl ########################################################################