[PATCH 3/3] configure.ac: remove --enable-aiglx option

[Jon Turney]

On 06/10/2016 19:15, Emil Velikov wrote:
> On 6 October 2016 at 19:02, Jon Turney <jon.turney at dronecode.org.uk> wrote:
>> On 29/09/2016 18:41, Emil Velikov wrote:
>>>
>>> Presently the option guards both direct and accelerated indirect GLX. As
>>> such when one toggles it off they end up without any acceleration.
>>>
>>> Remove the option all together until we have the time to split/rework
>>> things.
>>>
>>> Cc: Jon Turney <jon.turney at dronecode.org.uk>
>>> Cc: Adam Jackson <ajax at redhat.com>
>>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>>> ---
>>> Jon, I've not checked the Xwin side of things but considering that the
>>> option is enabled by default and having it for Xwin only will be
>>> confusing I've nuked the guards throughout the tree.
>>
>> Sorry I didn't get around to testing this before it was committed.
>>
>> This breaks my build (See [1]), as the DRI2 loader is now built
>> unconditionally, which fails without drm.h
>>
>> I'm not sure exactly what problem this change is fixing, so I'm not sure how
>> to address that.
>>
>> Is it ok to restore the part which makes building the DRI2 loader
>> conditional?
>>
> I had a bad feeling about this, fortunately it seems pretty easy to handle.
>
> From a quick look nothing in glx/glxdri2.c should require libdrm so we
> can nuke the drm.h and xf86drm.h includes, which will get you back up
> and going. Alternatively we can add those in a ifdef WITH_LIBDRM/endif
> block.

That's not quite enough, as building glxdri2.c also requires dri2proto 
headers.

At the moment, configure.ac only requires dri2proto when --enable-dri2 
turns on.

So either that needs to be made unconditional, or building glxdri2.c 
made conditional on DRI2 (untested patch attached)

> Even then we can make the compilation of the DRI2 loader but let's not
> call it AIGLX ;-)

-------------- next part --------------
From db2fcb2636a659abd0998d82204813fd5dcd57ff Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney at dronecode.org.uk>
Date: Thu, 6 Oct 2016 22:13:07 +0100
Subject: [PATCH xserver] Don't build DRI loader if DRI2 isn't enabled

---
 glx/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/glx/Makefile.am b/glx/Makefile.am
index fc0b76a..9af7080 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -16,11 +16,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
 	-I$(top_srcdir)/hw/xfree86/common \
 	-I$(top_srcdir)/hw/xfree86/dri \
+	-I$(top_srcdir)/hw/xfree86/dri2
 	-I$(top_srcdir)/mi \
 	-I$(top_srcdir)/present
 
-AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2
-
 indirect_sources =				\
 	indirect_dispatch.c			\
 	indirect_dispatch.h			\
@@ -33,7 +32,9 @@ indirect_sources =				\
 	indirect_table.c
 
 libglxdri_la_SOURCES =
+if DRI2
 libglxdri_la_SOURCES += glxdri2.c
+endif
 
 libglxdri_la_LIBADD = $(DLOPEN_LIBS)
 
-- 
2.8.3