Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14592
Modified Files:
acinclude.m4
Log Message:
tweaked dc1394 checks so that it checks for v2 first, also fixed directives
so that it will actually compile with v1
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** acinclude.m4 15 Nov 2006 00:05:58 -0000 1.123
--- acinclude.m4 15 Nov 2006 19:01:34 -0000 1.124
***************
*** 153,156 ****
--- 153,161 ----
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
+ [[#include "dc1394/control.h"]],
+ []),
+ dc1394_dma_setup_args="20")
+
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
[[#include "libdc1394/dc1394_control.h"]],
[[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL)]]),
***************
*** 162,170 ****
dc1394_dma_setup_args="12")
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
- [[#include "dc1394/dc1394_control.h"]],
- []),
- dc1394_dma_setup_args="20")
-
AC_DEFINE_UNQUOTED(DC1394_DMA_SETUP_CAPTURE_ARGS, $dc1394_dma_setup_args,
[arg count for dma capture function])
--- 167,170 ----
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
