[PATCH] hw/xfree86: Link libdri3 only when DRI3 is defined

[Matthieu Herrb]

On Mon, Nov 04, 2013 at 07:05:14PM -0800, Keith Packard wrote:
> Don't attempt to link non-existant libraries...
> 
> Signed-off-by: Keith Packard <keithp at keithp.com>

Reviewed-by: Matthieu Herrb <matthieu at herrb.eu>
> ---
> 
> DRI3 isn't part of hw/xfree86, so you need to go looking in
> $(top_builddir)
> 
>  hw/xfree86/Makefile.am | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index eea16a8..485386f 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -9,6 +9,11 @@ DRI2_SUBDIR = dri2
>  DRI2_LIB = dri2/libdri2.la
>  endif
>  
> +if DRI3
> +DRI3_BUILDDIR = $(top_builddir)/dri3
> +DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
> +endif
> +
>  if XF86UTILS
>  XF86UTILS_SUBDIR = utils
>  endif
> @@ -59,7 +64,7 @@ LOCAL_LIBS = \
>              dixmods/libxorgxkb.la \
>              $(DRI_LIB) \
>              $(DRI2_LIB) \
> -	    $(top_builddir)/dri3/libdri3.la \
> +	    $(DRI3_LIB) \
>  	    $(top_builddir)/miext/sync/libsync.la \
>              $(top_builddir)/mi/libmi.la \
>              $(top_builddir)/os/libos.la
> -- 
> 1.8.4.2
> 

-- 
Matthieu Herrb