X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=bc3d27fd1d916631eb537f14447bb82efa3907ea;hb=6354733cc5044c5226c430d97262c06ab4cd0d5e;hp=2309d358e2920ae90aaec8709860647d4e299271;hpb=83866b378628e6290bf435f5ae04a6d6de72d0e5;p=meshlink diff --git a/configure.ac b/configure.ac index 2309d358..bc3d27fd 100644 --- a/configure.ac +++ b/configure.ac @@ -96,9 +96,15 @@ PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.1.0], [cmocka=true], [cmocka=false]) PKG_CHECK_MODULES([LXC], [lxc >= 2.0.0], [lxc=true], [lxc=false]) AM_CONDITIONAL(BLACKBOX_TESTS, test "$cmocka" = true -a "$lxc" = true) + dnl Additional example code PKG_CHECK_MODULES([NCURSES], [ncurses >= 5], [curses=true], [curses=false]) -AM_CONDITIONAL(CURSES, test "$curses" = true) +AC_ARG_ENABLE([monitor_code], + [AS_HELP_STRING([--enable-monitor-code], [Add monitor example code to the build])], + [AS_IF([test "x$enable_monitor_code" = "xyes"], [monitor_code=true], [monitor_code=false])], + [monitor_code=false] +) +AM_CONDITIONAL(MONITOR, test "$monitor_code" = true) dnl Install test binaries AC_ARG_ENABLE([install_tests], @@ -112,7 +118,7 @@ AM_CONDITIONAL(INSTALL_TESTS, test "$install_tests" = true) dnl Checks for header files. dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies. -AC_CHECK_HEADERS([syslog.h sys/file.h sys/param.h sys/resource.h sys/socket.h sys/time.h sys/un.h sys/wait.h netdb.h arpa/inet.h dirent.h]) +AC_CHECK_HEADERS([syslog.h sys/file.h sys/param.h sys/resource.h sys/socket.h sys/time.h sys/un.h sys/wait.h netdb.h arpa/inet.h dirent.h curses.h]) dnl Checks for typedefs, structures, and compiler characteristics. MeshLink_ATTRIBUTE(__malloc__) @@ -128,7 +134,7 @@ AC_CHECK_TYPES([struct sockaddr_storage], ,AC_MSG_ERROR([System must support str dnl Checks for library functions. AC_TYPE_SIGNAL -AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random select strdup usleep], +AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random select setns strdup usleep], [], [], [#include "$srcdir/src/have.h"] ) @@ -167,6 +173,10 @@ AC_CONFIG_FILES([ test/blackbox/test_case_meta_conn_03/Makefile test/blackbox/test_case_meta_conn_04/Makefile test/blackbox/test_case_meta_conn_05/Makefile + test/blackbox/test_cases_submesh01/Makefile + test/blackbox/test_cases_submesh02/Makefile + test/blackbox/test_cases_submesh03/Makefile + test/blackbox/test_cases_submesh04/Makefile examples/Makefile ])