forked from ariadne/pkgconf
Compare commits
5 Commits
6a66b312b4
...
1cd84fec98
Author | SHA1 | Date |
---|---|---|
Dylan Baker | 1cd84fec98 | |
Ariadne Conill | 0226cdda6d | |
Dylan Baker | fa803c7ecd | |
Ariadne Conill | bddf1641f8 | |
Ariadne Conill | 8754bdfe09 |
|
@ -356,6 +356,7 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
pkgconf_solution_free(&pkg_client, &world);
|
||||||
pkgconf_queue_free(&pkgq);
|
pkgconf_queue_free(&pkgq);
|
||||||
pkgconf_cross_personality_deinit(personality);
|
pkgconf_cross_personality_deinit(personality);
|
||||||
pkgconf_client_deinit(&pkg_client);
|
pkgconf_client_deinit(&pkg_client);
|
||||||
|
|
|
@ -12,7 +12,7 @@ dnl implied. In no event shall the authors be liable for any damages arising
|
||||||
dnl from the use of this software.
|
dnl from the use of this software.
|
||||||
|
|
||||||
AC_PREREQ([2.71])
|
AC_PREREQ([2.71])
|
||||||
AC_INIT([pkgconf],[1.9.2],[https://github.com/pkgconf/pkgconf/issues/new])
|
AC_INIT([pkgconf],[1.9.3],[https://github.com/pkgconf/pkgconf/issues/new])
|
||||||
AC_CONFIG_SRCDIR([cli/main.c])
|
AC_CONFIG_SRCDIR([cli/main.c])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
|
AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
|
||||||
|
|
11
meson.build
11
meson.build
|
@ -1,7 +1,7 @@
|
||||||
project('pkgconf', 'c',
|
project('pkgconf', 'c',
|
||||||
version : '1.9.2',
|
version : '1.9.3',
|
||||||
license : 'ISC',
|
license : 'ISC',
|
||||||
meson_version : '>=0.47',
|
meson_version : '>=0.49',
|
||||||
default_options : ['c_std=c99'],
|
default_options : ['c_std=c99'],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -117,9 +117,10 @@ pkgconf_exe = executable('pkgconf',
|
||||||
c_args: build_static,
|
c_args: build_static,
|
||||||
install : true)
|
install : true)
|
||||||
|
|
||||||
if get_option('tests')
|
with_tests = get_option('tests')
|
||||||
kyua_exe = find_program('kyua')
|
kyua_exe = find_program('kyua', required : with_tests, disabler : true)
|
||||||
atf_sh_exe = find_program('atf-sh')
|
atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
|
||||||
|
if kyua_exe.found() and atf_sh_exe.found()
|
||||||
kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
|
kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
|
||||||
test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
|
test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
option('tests', type: 'boolean', value: true,
|
option(
|
||||||
description: 'Build tests which depends upon the kyua framework'
|
'tests',
|
||||||
|
type: 'feature',
|
||||||
|
description: 'Build tests which depends upon the kyua framework',
|
||||||
)
|
)
|
Loading…
Reference in New Issue