summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-09-04 11:15:00 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-09-04 11:15:22 (GMT)
commit44d884f036fa8147e8a16d2753c379198a5d5a6b (patch)
tree14bde7708355395ab2f8f6fb2592ed2f5da0310a
parent49f5519345d2cf803b082bca8a7c54a63a34865b (diff)
parent7f9e893f56db52078e0f46677ed337b2e25fa94d (diff)
downloadffmpeg-44d884f036fa8147e8a16d2753c379198a5d5a6b.zip
ffmpeg-44d884f036fa8147e8a16d2753c379198a5d5a6b.tar.gz
ffmpeg-44d884f036fa8147e8a16d2753c379198a5d5a6b.tar.bz2
Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'
* commit '7f9e893f56db52078e0f46677ed337b2e25fa94d': build: Report an error message when a pc file is not found Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index fe4350d..4ff97b4 100755
--- a/configure
+++ b/configure
@@ -995,7 +995,7 @@ check_pkg_config(){
headers="$2"
funcs="$3"
shift 3
- $pkg_config --exists $pkg 2>/dev/null || return
+ check_cmd $pkg_config --exists --print-errors $pkg || return
pkg_cflags=$($pkg_config --cflags $pkg)
pkg_libs=$($pkg_config --libs $pkg)
check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&