virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

configure: add a note about pkg-config --static.

Browse Source 
Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.
This commit is contained in:
Nicolas George
2014-12-02 13:54:46 +01:00
parent cfcaf6b38e
commit 6c96aa0606
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1211,7 +1211,7 @@ use_pkg_config(){
} }
require_pkg_config(){ require_pkg_config(){
use_pkg_config "$@" || die "ERROR: $pkg not found" use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message"
} }
require_libfreetype(){ require_libfreetype(){
@@ -3070,9 +3070,13 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
pkg_config_fail_message=""
if ! $pkg_config --version >/dev/null 2>&1; then if ! $pkg_config --version >/dev/null 2>&1; then
warn "$pkg_config not found, library detection may fail." warn "$pkg_config not found, library detection may fail."
pkg_config=false pkg_config=false
elif is_in -static $cc $LDFLAGS && ! is_in --static $pkg_config $pkg_config_flags; then
pkg_config_fail_message="
Note: When building a static binary, add --pkg-config-flags=\"--static\"."
fi fi
if test $doxygen != $doxygen_default && \ if test $doxygen != $doxygen_default && \