meson: doxygen and tests to feature options

Allows build to continue without passing extra options.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

doxygen/meson.build

@@ -1,3 +1,8 @@
+doxygen = find_program('doxygen', required: get_option('doxygen'))
+if not doxygen.found()
+  subdir_done()
+endif
+
 cdata.set('DOXYGEN_OUTPUT_DIRECTORY', meson.current_build_dir())
 
 doxygen_conf = configure_file(
@@ -7,4 +12,4 @@ doxygen_conf = configure_file(
 )
 
 run_target('doxygen',
-  command : ['doxygen', doxygen_conf])
+  command : [doxygen, doxygen_conf])

meson.build

@@ -840,9 +840,7 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
 
 # Subdirs
 
-if get_option('doxygen')
-  subdir('doxygen')
-endif
+subdir('doxygen')
 if get_option('client')
   subdir('po')
 endif

meson_options.txt

@@ -5,7 +5,7 @@ option('client',
        type : 'boolean', value : true,
        description : 'Build and install pulseaudio client libraries and utilities')
 option('doxygen',
-       type : 'boolean', value : true,
+       type : 'feature',
        description : 'Enable building and installation of documentation generated with doxygen')
 option('gcov',
        type : 'boolean', value : false,
@@ -14,7 +14,7 @@ option('man',
        type : 'boolean',
        description : 'Enable building and installation of man pages')
 option('tests',
-       type : 'boolean',
+       type : 'feature',
        description : 'Enable unit tests')
 
 option('system_user',

src/meson.build

@@ -224,7 +224,5 @@ if get_option('daemon')
   subdir('daemon')
   subdir('modules')
 endif
-if get_option('tests')
-  subdir('tests')
-endif
+subdir('tests')
 subdir('utils')

src/tests/meson.build

@@ -1,3 +1,7 @@
+if not check_dep.found()
+  subdir_done()
+endif
+
 # Note that a few tests have dependencies on src/modules.
 #
 # The syntax for tests declaration is: