[vlc-devel] [vlc-commits] Configure: use static linking if our contribs are used

[Rémi Denis-Courmont]

Le 2016-06-29 15:56, git at videolan.org a écrit :
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed
> Jun 29 15:44:40 2016 +0200| 
> [73b6ba35c70d93a57ddaec6e3a31164e60db53e2]
> | committer: Jean-Baptiste Kempf
>
> Configure: use static linking if our contribs are used
>
> Since our contribs are statically linked

This breaks very badly when mixing distro and contrib packages. Linux 
builds are unusable with this patch. Please revert.

>
>> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73b6ba35c70d93a57ddaec6e3a31164e60db53e2
> ---
>
>  configure.ac |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 341c2de..0db2531 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -821,9 +821,9 @@ AC_ARG_VAR(PKG_CONFIG_PATH,
>         [Paths where to find .pc not at the default location])
>  PKG_PROG_PKG_CONFIG()
>
> -dnl On some OS we need static linking
> +dnl If we use our contribs, we need static linking
>  AS_IF([test -n "${PKG_CONFIG}" ],[
> -    AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o
> "${SYS}" = "os2" ],[
> +    AS_IF([test -n "${CONTRIB_DIR}"],[
>          PKG_CONFIG="${PKG_CONFIG} --static"
>      ])
>  ])
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits

-- 
Rémi Denis-Courmont
http://www.remlab.net/