meson: use a feature option for tests instead of boolean

This allows tests to be autodetected gracefully, which is particularly
convenient for kyua and atf_sh which are fairly painful to build and
install by hand. Those who want to ensure tests are enabled or disabled
may pass `-Dtests=enabled` or `-Dtests=disabled` respectively.

NEWS

@@ -1,6 +1,15 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 1.9.2 to 1.9.3:
+----------------------------
+
+* Fix a bunch of minor code issues pointed out using Clang static analyzer.
+
+* New API: pkgconf_solution_free(), which frees a compiled solution graph.
+
+* Fix behavior when overriding global variables with `--define-variable`.
+
 Changes from 1.9.1 to 1.9.2:
 ----------------------------
 

cli/bomtool/main.c

@@ -356,6 +356,7 @@ 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.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_MACRO_DIR([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])

libpkgconf/libpkgconf.h

@@ -79,8 +79,8 @@ typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
-#define LIBPKGCONF_VERSION	10902
+#define LIBPKGCONF_VERSION	10903
-#define LIBPKGCONF_VERSION_STR	"1.9.2"
+#define LIBPKGCONF_VERSION_STR	"1.9.3"
 
 struct pkgconf_fragment_ {
 	pkgconf_node_t iter;

meson.build

@@ -1,7 +1,7 @@
 project('pkgconf', 'c',
-  version : '1.9.2',
+  version : '1.9.3',
   license : 'ISC',
-  meson_version : '>=0.47',
+  meson_version : '>=0.49',
   default_options : ['c_std=c99'],
 )
 
@@ -117,13 +117,12 @@ pkgconf_exe = executable('pkgconf',
   c_args: build_static,
   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)
 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')
-endif
 
 install_man('man/pkgconf.1')
 install_man('man/pkg.m4.7')

meson_options.txt

@@ -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',
 )