Hi,

This path should resolve the problem.

Axel

On 01/07/2014 10:53, Axel Davy wrote :
In src/loader/Makefile.am,

the test 'if NEED_OPENGL_COMMON' should probably be more restrictive,
I'm looking at it.

Axel

On 01/07/2014 10:22, Brian Paul wrote :
I configured with:

./autogen.sh CFLAGS="-g -O0" CXXFLAGS="-g -O0" --enable-debug --enable-xlib-glx --disable-driglx-direct --disable-dri --enable-gallium-osmesa --with-gallium-drivers=swrast --enable-gallium-tests

So no DRI code should be used.  When I compile:

gmake[2]: Entering directory `/home/brianp/projects/Mesa/mesa/src/loader'
  CC     libloader_la-loader.lo
loader.c:333:5: error: expected ',' or ';' before 'DRI_CONF_SECTION_INITIALIZATION'
gmake[2]: *** [libloader_la-loader.lo] Error 1

Reverting commit 3ecd9e1a93817180fa fixes the build for me.

-Brian


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


>From c79a9c85e8238ce32ed59ec1d02f69b5aeb813d7 Mon Sep 17 00:00:00 2001
From: Axel Davy <axel.d...@ens.fr>
Date: Tue, 1 Jul 2014 11:15:41 -0400
Subject: [PATCH] Fix the condition in src/loader/Makefile.am

we want to have the dri common files compiled
to define USE_DRICONF.
We need to check both NEED_OPENGL_COMMON and HAVE_DRICOMMON

Signed-off-by: Axel Davy <axel.d...@ens.fr>
---
 src/loader/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index ae8a844..c02de6f 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -33,6 +33,7 @@ libloader_la_SOURCES = $(LOADER_C_FILES)
 libloader_la_LIBADD =
 
 if NEED_OPENGL_COMMON
+if HAVE_DRICOMMON
 libloader_la_CPPFLAGS += \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
 	-I$(top_builddir)/src/mesa/drivers/dri/common/ \
@@ -47,6 +48,7 @@ libloader_la_LIBADD += \
 	-lm \
 	$(EXPAT_LIBS)
 endif
+endif
 
 if !HAVE_LIBDRM
 libloader_la_CPPFLAGS += \
-- 
1.9.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to