projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite integration test suite in Python
[tinc]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index
484b514
..
d2b76cb
100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-11,10
+11,10
@@
cdata.set_quoted('SBINDIR', dir_sbin)
cdata.set('HAVE_' + os_name.to_upper(), 1)
cdata.set('HAVE_' + os_name.to_upper(), 1)
-foreach attr : ['malloc', 'nonnull', 'warn_unused_result', 'packed']
+foreach attr : ['malloc', 'nonnull', 'warn_unused_result', 'packed'
, 'format'
]
if cc.has_function_attribute(attr)
cdata.set('HAVE_ATTR_' + attr.to_upper(), 1,
if cc.has_function_attribute(attr)
cdata.set('HAVE_ATTR_' + attr.to_upper(), 1,
- description: '__attribute__(
@0@
)'.format(attr))
+ description: '__attribute__(
(__@0@__)
)'.format(attr))
endif
endforeach
endif
endforeach
@@
-216,8
+216,10
@@
foreach type : check_types
endif
endforeach
endif
endforeach
+src_getopt = []
if not cdata.has('HAVE_GETOPT_H') or not cc.has_function('getopt_long', prefix: have_prefix, args: cc_defs)
if not cdata.has('HAVE_GETOPT_H') or not cc.has_function('getopt_long', prefix: have_prefix, args: cc_defs)
- src_lib_common += ['getopt.c', 'getopt1.c']
+ src_getopt = ['getopt.c', 'getopt1.c']
+ src_lib_common += src_getopt
endif
if not opt_miniupnpc.disabled()
endif
if not opt_miniupnpc.disabled()
@@
-403,7
+405,7
@@
exe_tincd = executable(
exe_sptps_test = executable(
'sptps_test',
exe_sptps_test = executable(
'sptps_test',
- sources:
'sptps_test.c'
,
+ sources:
[src_getopt, 'sptps_test.c']
,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
@@
-413,7
+415,7
@@
exe_sptps_test = executable(
exe_sptps_keypair = executable(
'sptps_keypair',
exe_sptps_keypair = executable(
'sptps_keypair',
- sources:
'sptps_keypair.c'
,
+ sources:
[src_getopt, 'sptps_keypair.c']
,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,