Update to 2.0.0 tree from current Fremantle build
[opencv] / debian / patches / 040_check_for_newer_dc1394.diff
1 Index: opencv-1.0.0/configure.in
2 ===================================================================
3 --- opencv-1.0.0.orig/configure.in      2009-03-01 22:32:22.000000000 +0100
4 +++ opencv-1.0.0/configure.in   2009-03-01 22:32:30.000000000 +0100
5 @@ -483,14 +483,14 @@
6                                       ]))
7          
8          if test x"$have_raw1394" = "xyes"; then
9 -            AC_CHECK_HEADER(libdc1394/dc1394_control.h,
10 -                            AC_CHECK_LIB(dc1394_control, dc1394_camera_on, 
11 +            AC_CHECK_HEADER(dc1394/control.h,
12 +                            AC_CHECK_LIB(dc1394, dc1394_camera_set_power, 
13                                           [
14                                             have_dc1394=yes
15                                             AC_DEFINE(HAVE_DC1394,,[IEEE1394 capturing support])
16 -                                           AC_EGREP_HEADER(do_extra_buffering, libdc1394/dc1394_control.h,
17 -                                                           [AC_DEFINE(HAVE_DC1394_095,,[libdc1394 0.9.4 or 0.9.5])])
18 -                                           IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
19 +                                           AC_EGREP_HEADER(dc1394_camera_set_power, dc1394/control.h,
20 +                                                           [AC_DEFINE(HAVE_DC1394_2_X,,[libdc1394 2.x])])
21 +                                           IEEE1394LIBS="-lm -lraw1394"
22                                           ]))
23          fi
24