Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'

* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-23 11:10:25 +01:00
commit 69c32456a0

2
configure vendored
View File

@ -4995,7 +4995,7 @@ fi
# libdc1394 check
if enabled libdc1394; then
{ check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
{ require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new &&
enable libdc1394_2; } ||
{ check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
enable libdc1394_1; } ||