OSDN Git Service

mesa: fix the condition in src/loader/Makefile.am
authorAxel Davy <axel.davy@ens.fr>
Tue, 1 Jul 2014 15:15:41 +0000 (11:15 -0400)
committerBrian Paul <brianp@vmware.com>
Tue, 1 Jul 2014 15:42:44 +0000 (09:42 -0600)
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@ens.fr>
Tested-by: Brian Paul <brianp@vmware.com>
src/loader/Makefile.am

index ae8a844..c02de6f 100644 (file)
@@ -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 += \