[FFmpeg-devel] [PATCH 2/2] configure: add a note about pkg-config --static.

[tim nicholson]

On 02/12/14 13:16, Nicolas George wrote:
> Try to detect "$cc -static" without "pkg-config --static".
> Also always print when a library that was not found was
> detected using pkg-config.

I was slightly confused by what you meant here, but looking at the code
I think you mean that if a library was not found by means of pkg-config,
then say that that was the detecting mechanism in use, rather than just
saying not found.

In which case a helpful improvement, as is the --static test (but I
would say that :( )

> 
> Signed-off-by: Nicolas George <george at nsup.org>
> ---
>  configure | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index af89e05..587a4e1 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 && \
> 


-- 
Tim.
Key Fingerprint 38CF DB09 3ED0 F607 8B67 6CED 0C0B FC44 8B0B FC83