[FFmpeg-cvslog] Fix opencv detection.

Jonas Bechtel git at videolan.org
Sat Jan 19 10:46:35 CET 2013


ffmpeg | branch: release/1.1 | Jonas Bechtel <bechtel at linux-gbm7.(none)> | Sun Jan 13 21:45:15 2013 +0100| [397fafad230a7d4f2d2c0908ae56418318e82148] | committer: Carl Eugen Hoyos

Fix opencv detection.

This commit changes the ".so" argument placement in check_ld sub-program.
(cherry picked from commit a003c5bd4ff1846edba0518306f8091c14041c96)

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

 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4e4fbab..4dd265f 100755
--- a/configure
+++ b/configure
@@ -789,8 +789,8 @@ check_ld(){
     log check_ld "$@"
     type=$1
     shift 1
-    flags=$(filter_out '-l*' $@)
-    libs=$(filter '-l*' $@)
+    flags=$(filter_out '-l*|*.so' $@)
+    libs=$(filter '-l*|*.so' $@)
     check_$type $($cflags_filter $flags) || return
     flags=$($ldflags_filter $flags)
     libs=$($ldflags_filter $libs)



More information about the ffmpeg-cvslog mailing list