aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-12-02 13:54:46 +0100
committerNicolas George <george@nsup.org>2014-12-02 18:43:54 +0100
commit6c96aa06066db2a62667b6c537a38db7eab25f7f (patch)
tree789a65314a75f22f12ee0b3ab3107f2df790d84c
parentcfcaf6b38e39ed6e788abb1a5a44f23660dce2f6 (diff)
downloadffmpeg-6c96aa06066db2a62667b6c537a38db7eab25f7f.tar.gz
configure: add a note about pkg-config --static.
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.
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index 12f93f3a4e..c046e3484d 100755
--- a/configure
+++ b/configure
@@ -1211,7 +1211,7 @@ use_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(){
@@ -3070,9 +3070,13 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
enabled cross_compile || host_cc_default=$cc
set_default host_cc
+pkg_config_fail_message=""
if ! $pkg_config --version >/dev/null 2>&1; then
warn "$pkg_config not found, library detection may fail."
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
if test $doxygen != $doxygen_default && \