diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-01-21 23:02:36 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:35 +0000 |
| commit | 5435708a50beb0368ed6694695ac89f9a8d49c07 (patch) | |
| tree | 6d052a72fae3a5238598e38ec05a3fcc6e7b165a | |
| parent | 9d3707a78f8adb5851ff65dbc4254d628556b03b (diff) | |
build: Only build the assembler if flex and bison are found
And start displaying a nice summary of what we are going to compile.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a8062329..67b6563f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,11 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = lib man tools scripts benchmarks demos assembler +SUBDIRS = lib man tools scripts benchmarks demos + +if BUILD_ASSEMBLER +SUBDIRS += assembler +endif if BUILD_SHADER_DEBUGGER SUBDIRS += debugger diff --git a/configure.ac b/configure.ac index 38ed3e69..c392812b 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,12 @@ if test x"$udev" = xyes; then fi PKG_CHECK_MODULES(GLIB, glib-2.0) +# can we build the assembler? +AS_IF([test x"$LEX" != "x:" -a x"$YACC" != xyacc], + [enable_assembler=yes], + [enable_assembler=no]) +AM_CONDITIONAL(BUILD_ASSEMBLER, [test "x$enable_assembler" = xyes]) + # ----------------------------------------------------------------------------- # Configuration options # ----------------------------------------------------------------------------- @@ -178,4 +184,13 @@ AC_CONFIG_FILES([ ]) AC_OUTPUT +# Print a summary of the compilation +echo "" +echo "Intel GPU tools" + +echo "" +echo " • Tools:" +echo " Assembler: ${enable_assembler}" +echo "" + # vim: set ft=config ts=8 sw=8 tw=0 noet : |