[vlc-devel] [vlc-commits] configure: unbreak cross-pkg-config support with contrib

[Rafaël Carré]

On 03/01/14 20:44, Rémi Denis-Courmont wrote:
> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  1 16:00:32 2014 +0200| [d280b44e2def2bca73745f857f4c8b165c1ccc05] | committer: Rémi Denis-Courmont
> 
> configure: unbreak cross-pkg-config support with contrib

What is 'cross-pkg-config tools' exactly ?

I only saw something like this in Fedora and I have no idea yet how
hacky it is.

> cross-pkg-config tools have a correct default search path. The contrib
> path should complement it, not replace it. If the caller intends to
> (ab)use the native pkg-config for cross-compilation, the caller is
> responsible for selecting an adequate default path, not VLC configure,
> just as with every other build tools.

This breaks automated android and windows builds.

Patch is rejected.

Revert asap.

>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d280b44e2def2bca73745f857f4c8b165c1ccc05
> ---
> 
>  configure.ac |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index e4be0bf..0914bde 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -375,11 +375,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
>    CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
>    CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
>    OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
> -  AS_IF([test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"], [
> -    export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
> -  ], [
> -    export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
> -  ])
> +  export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
>    LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
>  
>    AS_IF([test "${SYS}" = "darwin"], [