[Playerstage-commit] code/player acinclude.m4,1.80,1.81

[Toby C. <th...@us...>]

Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30874

Modified Files:
	acinclude.m4 
Log Message:
updated dc1394 driver to support v2.0 api pre6 (was previously pre5)


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** acinclude.m4	10 Apr 2006 13:27:47 -0000	1.80
--- acinclude.m4	16 Apr 2006 23:55:51 -0000	1.81
***************
*** 137,141 ****
  PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
  
! PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h libdc1394/dc1394_control.h"],[],["-lraw1394 -ldc1394_control"])
  
  dnl libdc1394 has varying API's, depending on the version.  Do some checks
--- 137,143 ----
  PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
  
! dnl Check to see if we have version 1 or 2 API for dc1394
! AC_CHECK_HEADER(dc1394/dc1394_control.h,[PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h dc1394/dc1394_control.h"],[],["-lraw1394 -ldc1394"])],
! 	[PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h libdc1394/dc1394_control.h"],[],["-lraw1394 -ldc1394_control"])])
  
  dnl libdc1394 has varying API's, depending on the version.  Do some checks
***************
*** 153,161 ****
      [[#include "libdc1394/dc1394_control.h"]],
      [[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL)]]),
!     $enable_camera1394="12")
  
    AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
!     [[#include "libdc1394/dc1394_control.h"]],
!     [[#if LIBDC1394_VERSION != 0200 #error #endif]]),
      dc1394_dma_setup_args="20")
  
--- 155,163 ----
      [[#include "libdc1394/dc1394_control.h"]],
      [[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL)]]),
!     dc1394_dma_setup_args="12")
  
    AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
!     [[#include "dc1394/dc1394_control.h"]],
!     []),
      dc1394_dma_setup_args="20")