Mesa (master): mesa: fix the condition in src/loader/Makefile.am

[Brian Paul]

Module: Mesa
Branch: master
Commit: 4d6c9352f3b1d7c2df626b30bbfc6da4dfaf52e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d6c9352f3b1d7c2df626b30bbfc6da4dfaf52e6

Author: Axel Davy <axel.davy at ens.fr>
Date:   Tue Jul  1 11:15:41 2014 -0400

mesa: 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.davy at ens.fr>
Tested-by: Brian Paul <brianp at vmware.com>

---

 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 += \