Merge pull request #27 from scymtym/master

configure: add option to disable C++ demo block
kmarkus · Aug 31, 2020 · 2dbc4bd · 2dbc4bd
2 parents e8fa66a + e1ef8fd
commit 2dbc4bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -34,6 +34,11 @@ if test "x${enable_timesrc_tsc}" = xyes; then
   AC_DEFINE([TIMESRC_TSC], 1, [use TSC as timesource instead of POSIX time])
 fi
 
+# C++ demo block is optional
+AC_ARG_ENABLE([cpp-demo],
+  AS_HELP_STRING([--enable-cpp-demo],[build example C++ block]))
+AM_CONDITIONAL([CPP_DEMO], [test x$enable_cpp_demo = xyes])
+
 # required for TSC only
 AC_DEFINE([CPU_HZ], 1600000000, [cpu hz defined])
 

diff --git a/std_blocks/Makefile.am b/std_blocks/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = const \
-	  cppdemo \
 	  examples \
           hexdump \
           lfds_buffers \
@@ -12,3 +11,7 @@ SUBDIRS = const \
 	  saturation \
           trig \
           webif
+
+if CPP_DEMO
+SUBDIRS += cppdemo
+endif