X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeson.build;h=d9f7b14bd6c6458e46574a10c332261c7b0f0392;hb=72091d5c770856870bb8cd51bcc5641078c7562c;hp=351124e72b3277646933b03ab210585bc71aef6e;hpb=0f8e3c9f6f2ed4052387397756cd6e05cd28cd00;p=tinc diff --git a/src/meson.build b/src/meson.build index 351124e7..d9f7b14b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -62,6 +62,7 @@ check_headers = [ 'sys/ioctl.h', 'sys/mman.h', 'sys/param.h', + 'sys/random.h', 'sys/resource.h', 'sys/socket.h', 'sys/stat.h', @@ -85,6 +86,7 @@ check_functions = [ 'explicit_bzero', 'explicit_memset', 'fchmod', + 'getentropy', 'gettimeofday', 'memset_s', 'mlockall', @@ -172,6 +174,7 @@ src_tincd = [ 'subnet.c', ] +cc_flags_tinc = cc_flags cc_flags_tincd = cc_flags deps_common = [] @@ -267,6 +270,9 @@ if not opt_curses.disabled() if dep_curses.found() cdata.set('HAVE_CURSES', 1) deps_tinc += dep_curses + if static + cc_flags_tinc += '-DNCURSES_STATIC' + endif endif endif @@ -352,16 +358,17 @@ endif subdir(opt_crypto) -if opt_crypto != 'openssl' - src_lib_crypto += 'crypto.c' -endif - if opt_crypto != 'nolegacy' src_lib_crypto += ['cipher.c', 'digest.c'] endif subdir('include') +have_sandbox = cdata.has('HAVE_SANDBOX') +if not have_sandbox + src_lib_common += 'sandbox.c' +endif + lib_crypto = static_library( 'tinc_crypto', sources: src_lib_crypto, @@ -390,6 +397,7 @@ lib_tinc = static_library( sources: src_tinc, dependencies: deps_tinc, link_with: lib_common, + c_args: cc_flags_tinc, implicit_include_directories: false, include_directories: inc_conf, build_by_default: false,