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

[Jon Turney]

On 09/10/2016 15:42, Emil Velikov wrote:
> On Friday, 7 October 2016, Jon Turney wrote:
>>
>> 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)
>>
>> You're correct. Wrapping it in DRI2 conditional is a good idea.
>
> Note creating an empty (no sources or static libs) library is likely to
> cause problems. Just use the form prior to my patch ?

Yes, that seems possible.  Updated patch attached.


-------------- next part --------------
From 42f74bb44190be06b9630dfcaae48b27533a28cd 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] glx/dri2: Don't build DRI loader if DRI2 isn't
 enabled

This partially reverts 501d8e2b.
---
 glx/Makefile.am                | 11 ++++++++---
 hw/xfree86/dixmods/Makefile.am |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/glx/Makefile.am b/glx/Makefile.am
index fc0b76a..60bd84c 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -1,4 +1,8 @@
-noinst_LTLIBRARIES = libglx.la libglxdri.la
+if DRI2
+GLXDRI_LIBRARY = libglxdri.la
+endif
+
+noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
 
 AM_CFLAGS = \
 	@DIX_CFLAGS@ \
@@ -16,11 +20,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 +36,9 @@ indirect_sources =				\
 	indirect_table.c
 
 libglxdri_la_SOURCES =
+if DRI2
 libglxdri_la_SOURCES += glxdri2.c
+endif
 
 libglxdri_la_LIBADD = $(DLOPEN_LIBS)
 
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index be43e8f..d534c78 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -29,10 +29,12 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
 
 libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
 libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS)
+if DRI2
 libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la
 if NO_UNDEFINED
 libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS)
 endif
+endif
 libglx_la_SOURCES = glxmodule.c
 
 libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
-- 
2.8.3