X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=configure.ac;h=1b0b2e06351307a9aa5dbdfa18d838ec7a05ad0a;hp=f62eff73bf29966bfa5f4e46e2e9a14e584ca234;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=682c5ae66dccbce8336fd0e0d3dc40f087644ca6 diff --git a/configure.ac b/configure.ac index f62eff73..1b0b2e06 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AC_INIT([MeshLink], [0.1]) AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SUBDIRS([catta]) AM_SILENT_RULES([yes]) # Enable GNU extensions. @@ -23,6 +22,7 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_LIBTOOL +AX_PTHREAD dnl Check and set OS @@ -57,18 +57,18 @@ dnl No -fstack-protector-all because it doesn't work on all platforms or archite AC_ARG_ENABLE([hardening], AS_HELP_STRING([--disable-hardening], [disable compiler and linker hardening flags])) AS_IF([test "x$enable_hardening" != "xno"], - [AX_CHECK_COMPILE_FLAG([-DFORTIFY_SOURCE=2], [CPPFLAGS="$CPPFLAGS -DFORITFY_SOURCE=2"]) - AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CPPFLAGS="$CPPFLAGS -fno-strict-overflow"]) - AX_CHECK_COMPILE_FLAG([-fwrapv], [CPPFLAGS="$CPPFLAGS -fwrapv"]) + [CPPFLAGS="$CPPFLAGS -Wall -W -pedantic" + AX_CHECK_COMPILE_FLAG([-DFORTIFY_SOURCE=2], [CPPFLAGS="$CPPFLAGS -DFORITFY_SOURCE=2"]) + AX_CHECK_COMPILE_FLAG([-fwrapv], [CPPFLAGS="$CPPFLAGS -fwrapv"], + [AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CPPFLAGS="$CPPFLAGS -fno-strict-overflow"])] + ) case $host_os in *mingw*) AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"]) AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"]) ;; *) - AX_CHECK_COMPILE_FLAG([-fPIE], [CPPFLAGS="$CPPFLAGS -fPIE"]) AX_CHECK_COMPILE_FLAG([-fPIC], [CPPFLAGS="$CPPFLAGS -fPIC"]) - AX_CHECK_LINK_FLAG([-pie], [LDFLAGS="$LDFLAGS -pie"]) ;; esac AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) @@ -76,6 +76,14 @@ AS_IF([test "x$enable_hardening" != "xno"], ] ); +dnl Allow building without Catta +AC_ARG_ENABLE([catta], AS_HELP_STRING([--disable-catta], [disable linking with the Catta library])) +AS_IF([test "x$enable_catta" != "xno"], + AC_DEFINE(HAVE_CATTA, 1, [Link with Catta]) + AC_CONFIG_SUBDIRS([catta]) +) +AM_CONDITIONAL(CATTA, test "x$enable_catta" != "xno") + dnl UTCP debug flags AC_ARG_ENABLE([utcp_debug], AS_HELP_STRING([--enable-utcp-debug], [compile utcp with debug output])) AS_IF([test "x$enable_utcp_debug" = "xyes"], @@ -83,6 +91,21 @@ AS_IF([test "x$enable_utcp_debug" = "xyes"], ] ); +dnl Blackbox test suite +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]) +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], [AS_HELP_STRING([--enable-install-tests], [include test binaries in installation])], @@ -95,24 +118,24 @@ 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 ifaddrs.h]) dnl Checks for typedefs, structures, and compiler characteristics. MeshLink_ATTRIBUTE(__malloc__) MeshLink_ATTRIBUTE(__warn_unused_result__) AC_CHECK_TYPES([socklen_t, struct addrinfo, struct sockaddr_in6], , , - [#include "src/have.h"] + [#include "$srcdir/src/have.h"] ) AC_CHECK_TYPES([struct sockaddr_storage], ,AC_MSG_ERROR([System must support struct sockaddr_storage.]), - [#include "src/have.h"] + [#include "$srcdir/src/have.h"] ) dnl Checks for library functions. AC_TYPE_SIGNAL -AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random select strdup usleep], - [], [], [#include "src/have.h"] +AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random pselect select setns strdup usleep getifaddrs freeifaddrs], + [], [], [#include "$srcdir/src/have.h"] ) dnl Support for SunOS @@ -125,11 +148,36 @@ AC_CHECK_FUNC(gethostbyname, [], [ ]) AC_CHECK_DECLS([freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo], - [], [], [#include "src/have.h"] + [], [], [#include "$srcdir/src/have.h"] ) AC_CACHE_SAVE -AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile test/Makefile examples/Makefile]) +AC_CONFIG_FILES([ + Makefile + src/Makefile + doc/Makefile + test/Makefile + test/blackbox/Makefile + test/blackbox/run_blackbox_tests/Makefile + test/blackbox/test_case_channel_conn_01/Makefile + test/blackbox/test_case_channel_conn_02/Makefile + test/blackbox/test_case_channel_conn_03/Makefile + test/blackbox/test_case_channel_conn_04/Makefile + test/blackbox/test_case_channel_conn_05/Makefile + test/blackbox/test_case_channel_conn_06/Makefile + test/blackbox/test_case_channel_conn_07/Makefile + test/blackbox/test_case_channel_conn_08/Makefile + test/blackbox/test_case_meta_conn_01/Makefile + test/blackbox/test_case_meta_conn_02/Makefile + 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 +]) AC_OUTPUT