[FFmpeg-cvslog] configure: Use pkg-config for libdc1394 discovery

Vittorio Giovara git at videolan.org
Mon Feb 23 11:18:48 CET 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sun Feb 22 20:33:24 2015 +0000| [f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7] | committer: Vittorio Giovara

configure: Use pkg-config for libdc1394 discovery

Since not all systems need the libraw1394 dependency, let pkg-config
provide the list of libraries actually needed.

The libdc1394-2.pc file has been included since version 2 (2008-01-05),
so it should be safe to use.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 8c618be..4543b00 100755
--- a/configure
+++ b/configure
@@ -4248,7 +4248,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; } ||



More information about the ffmpeg-cvslog mailing list