[FFmpeg-cvslog] Apply again [916352f282855e3e4e86a39df9452fead2aa0771] that got lost in the merges.

Alexis Ballier git at videolan.org
Fri Nov 2 00:31:50 CET 2012


ffmpeg | branch: master | Alexis Ballier <aballier at gentoo.org> | Thu Nov  1 11:14:59 2012 -0300| [1475815a1a064720842ac92b4cc32af60dd8b6f6] | committer: Michael Niedermayer

Apply again [916352f282855e3e4e86a39df9452fead2aa0771] that got lost in the merges.

Do not quote second argument to filter{,_out} in check_ld. We want to keep/remove all the space-separated words matching the -l* pattern, not keep everything if the whole argument begins with -l and remove it otherwise.

This also fixes errors like:
./configure: eval: line 418: syntax error near unexpected token `-l*'
./configure: eval: line 418: `case  in -l*) ;; *) echo  ;; esac'
when run with ./configure --enable-openal

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

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



More information about the ffmpeg-cvslog mailing list