aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-23 11:10:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-23 11:10:56 +0100
commit69c32456a045235c67243515384666c741b7e8e6 (patch)
treebb60f26e6ab59845ce26a601965d8c3be128e09f
parent92b7f56193619c94fccd1664d059f329a9aa7432 (diff)
parentf7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7 (diff)
downloadffmpeg-69c32456a045235c67243515384666c741b7e8e6.tar.gz
Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'
* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7': configure: Use pkg-config for libdc1394 discovery Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 2696cb2a4a..3c713022ea 100755
--- a/configure
+++ b/configure
@@ -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; } ||