util: add allow_glsl_builtin_const_expression to drirc for Google Earth VR

[mesa.git] / src / util / Makefile.am

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a5241ad27bae6597bc864b2618e679fffe7ea0f6..65794338c5b886c65b76e7269bee2479b33d099b 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -24,6 +24,10 @@ SUBDIRS = . \
        tests/hash_table \
        tests/string_buffer
 
+if HAVE_STD_CXX11
+SUBDIRS += tests/vma
+endif
+
 include Makefile.sources
 
 noinst_LTLIBRARIES = \
@@ -31,6 +35,7 @@ noinst_LTLIBRARIES = \
        libxmlconfig.la
 
 AM_CPPFLAGS = \
+       $(PTHREAD_CFLAGS) \
        -I$(top_srcdir)/include
 
 libmesautil_la_CPPFLAGS = \
@@ -50,6 +55,7 @@ libmesautil_la_SOURCES = \
        $(MESA_UTIL_GENERATED_FILES)
 
 libmesautil_la_LIBADD = \
+       $(PTHREAD_LIBS) \
        $(CLOCK_LIB) \
        $(ZLIB_LIBS) \
        $(LIBATOMIC_LIBS)
@@ -81,7 +87,8 @@ EXTRA_DIST = \
        merge_driinfo.py \
        SConscript \
        xmlpool.h \
-       sha1/README
+       sha1/README \
+       meson.build
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)