cli/bomtool/main.c

@@ -356,7 +356,6 @@ main(int argc, char *argv[])
 	}
 
 out:
-	pkgconf_solution_free(&pkg_client, &world);
 	pkgconf_queue_free(&pkgq);
 	pkgconf_cross_personality_deinit(personality);
 	pkgconf_client_deinit(&pkg_client);

configure.ac

@@ -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.
 
 AC_PREREQ([2.71])
-AC_INIT([pkgconf],[1.9.3],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_INIT([pkgconf],[1.9.2],[https://github.com/pkgconf/pkgconf/issues/new])
 AC_CONFIG_SRCDIR([cli/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])

meson.build

@@ -1,7 +1,7 @@
 project('pkgconf', 'c',
-  version : '1.9.3',
+  version : '1.9.2',
   license : 'ISC',
-  meson_version : '>=0.49',
+  meson_version : '>=0.47',
   default_options : ['c_std=c99'],
 )
 
@@ -117,10 +117,9 @@ pkgconf_exe = executable('pkgconf',
   c_args: build_static,
   install : true)
 
-with_tests = get_option('tests')
+if get_option('tests')
-kyua_exe = find_program('kyua', required : with_tests, disabler : true)
+  kyua_exe = find_program('kyua')
-atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
+  atf_sh_exe = find_program('atf-sh')
-if kyua_exe.found() and atf_sh_exe.found()
   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()])
   subdir('tests')

meson_options.txt

@@ -1,5 +1,3 @@
-option(
+option('tests', type: 'boolean', value: true,
-  'tests',
+  description: 'Build tests which depends upon the kyua framework'
-  type: 'feature',
-  description: 'Build tests which depends upon the kyua framework',
 )