[Patch] glamor: Don't build glamor egl/gbm related code if GLAMOR_DDX disabled

[Alan Coopersmith]

That fixes it and lets the build complete for me, thanks.

Tested-by: Alan Coopersmith <alan.coopersmith at oracle.com>

	-alan-

On 09/27/11 08:06 PM, zhigang gong wrote:
> Alan,
>
> I think you tried Xephyr-glamor at first and met the compilation failure.
> Here is a patch to fix that, please help to check and review it. Thanks.
>
> As to the coding style and indent problem, I am reading the Xorg
> coding style wiki page. And will solve fix them in my the second
> pull request. Thanks.
>
> The patch is starting as below:
>
> For Xephyr-glamor, we don't need to enable GLAMOR_DDX and don't
> need those egl/gbm interfaces. So we don't check the gbm and egl
> for that case, but we still build the corresponding code. Now
> fix it.
>
> Signed-off-by: Zhigang Gong<zhigang.gong at linux.intel.com>
> ---
>   hw/xfree86/Makefile.am         |    2 +-
>   hw/xfree86/dixmods/Makefile.am |    4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index f76a361..3f8695e 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -27,7 +27,7 @@ if INT10MODULE
>   INT10_SUBDIR = int10
>   endif
>
> -if GLAMOR
> +if GLAMOR_DDX
>   GLAMOR_DIR=glamor
>   endif
>
> diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
> index ba4aeb4..5b84704 100644
> --- a/hw/xfree86/dixmods/Makefile.am
> +++ b/hw/xfree86/dixmods/Makefile.am
> @@ -14,7 +14,7 @@ if RECORD
>   RECORDMOD = librecord.la
>   endif
>
> -if GLAMOR
> +if GLAMOR_DDX
>   LIBGLAMOR_DIX = libglamor_dix.la
>   endif
>
> @@ -39,7 +39,7 @@ INCLUDES = @XORG_INCS@ \
>   libdbe_la_LDFLAGS = -avoid-version
>   libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
>   libdbe_la_SOURCES = dbemodule.c
> -if GLAMOR
> +if GLAMOR_DDX
>   libglamor_dix_la_LDFLAGS = -avoid-version
>   libglamor_dix_la_LIBADD = $(top_builddir)/glamor/libglamor.la
>   libglamor_dix_la_SOURCES = glamor_module.c $(top_srcdir)/glamor/glamor_egl.c
> --
> 1.7.3.1


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System