[Mesa-dev] [PATCH 15/20] configure: read libomxil-bellagio.pc only when it exists

[Christian König]

Am 04.03.2014 22:12, schrieb Emil Velikov:
> Currenly configure.ac will print a warning when one is missing the package.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   configure.ac | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 21db389..36d7895 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1646,11 +1646,16 @@ AC_ARG_WITH([vdpau-libdir],
>       [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
>   AC_SUBST([VDPAU_LIB_INSTALL_DIR])
>   
> +OMX_LIB_INSTALL_DIR_DEFAULT=''
> +if test "x$enable_omx" = xyes; then
> +    OMX_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio`
> +fi
> +
>   AC_ARG_WITH([omx-libdir],
>       [AS_HELP_STRING([--with-omx-libdir=DIR],
>           [directory for the OMX libraries])],
>       [OMX_LIB_INSTALL_DIR="$withval"],
> -    [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio`])
> +    [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"])
>   AC_SUBST([OMX_LIB_INSTALL_DIR])
>   
>   dnl Directory for OpenCL libs