[Intel-gfx] [PATCH 01/12] configure.ac: slightly more standard --disable-tests

[Ben Widawsky]

This partially reverts
commit 7c170724003f42cd4ceea9f6c805292bbe2e81b2
Author: Rodrigo Vivi <rodrigo.vivi at gmail.com>
Date:   Tue Feb 5 16:17:54 2013 -0200

    Build: Add --disable-tests configure flag to avoid tests build

I was still in the middle of arguing this when Daniel merged it.

Cc: Rodrigo Vivi <rodrigo.vivi at gmail.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Julien Cristau <jcristau at debian.org>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
 configure.ac      | 2 +-
 tests/Makefile.am | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e66876c..d66c9f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,6 @@ AC_ARG_ENABLE(tests,
 	      [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"])
 if test "x$BUILD_TESTS" = xyes; then
 	AC_DEFINE(BUILD_TESTS, 1, [Build tests])
-	AC_CONFIG_FILES([tests/Makefile])
 fi
 AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
 
@@ -139,6 +138,7 @@ AC_CONFIG_FILES([
 		 lib/Makefile
 		 man/Makefile
 		 scripts/Makefile
+		 tests/Makefile
 		 tools/Makefile
 		 debugger/Makefile
 		 debugger/system_routine/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 20b7324..ef68a02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,4 @@
+if BUILD_TESTS
 noinst_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
@@ -195,3 +196,4 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
 prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
+endif
-- 
1.8.1.2