ffmpeg | branch: master | Nicolas George <[email protected]> | Tue Dec 2 13:54:46 2014 +0100| [6c96aa06066db2a62667b6c537a38db7eab25f7f] | committer: Nicolas George
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. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c96aa06066db2a62667b6c537a38db7eab25f7f --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 12f93f3..c046e34 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 && \ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
