From 57c72e0ddbc14519dd9b596458e6788a805f169e Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@redhat.com>
Date: Sat, 26 Dec 2020 12:54:03 -0500
Subject: Simplifying the meson configure options

---
 meson.build       | 15 +++------------
 meson_options.txt |  6 +++---
 tools/meson.build |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index a900732..e705550 100644
--- a/meson.build
+++ b/meson.build
@@ -38,8 +38,6 @@ xmllint_prg = find_program('xmllint', required: true)
 xsltproc_prg = find_program('xsltproc', required: true)
 itstool_prg = find_program('itstool', required: true)
 
-awk_prg = find_program('awk', required: false)
-
 yelp_db2html_path = yelp_xsl_dep.get_pkgconfig_variable('db2html')
 yelp_db2xhtml_path = yelp_xsl_dep.get_pkgconfig_variable('db2xhtml')
 yelp_mal2html_path = yelp_xsl_dep.get_pkgconfig_variable('mal2html')
@@ -53,18 +51,11 @@ yelp_icons_dir = join_paths(
   'hicolor', '24x24', 'status',
 )
 
-# Options
-build_yelp_manual = get_option('yelp_manual')
-if not awk_prg.found()
-  build_yelp_manual = false
-endif
-
 subdir('xslt')
 subdir('templates')
-
 subdir('tools')
 
-if build_yelp_manual == true
+if get_option('help') == true
   subdir('help')
 endif
 
@@ -73,8 +64,8 @@ summary = [
   '------',
   'yelp-tools @0@'.format(version),
   '',
-  '  Autotools: @0@'.format(get_option('autotools')),
-  '     Manual: @0@'.format(build_yelp_manual),
+  '    yelp.m4: @0@'.format(get_option('yelpm4')),
+  '       help: @0@'.format(get_option('help')),
   '',
   'Directories:',
   '     prefix: @0@'.format(prefix),
diff --git a/meson_options.txt b/meson_options.txt
index 2dab818..0526e6f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,7 @@
-option('autotools',
+option('yelpm4',
        type: 'boolean', value: true,
        description: 'Install autotools macros')
 
-option('yelp_manual',
+option('help',
        type: 'boolean', value: false,
-       description: 'Build user manual (requires awk)')
\ No newline at end of file
+       description: 'Install help files')
diff --git a/tools/meson.build b/tools/meson.build
index 16d9c80..b6b3956 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -58,7 +58,7 @@ configure_file(
   install_dir: bindir,
 )
 
-if get_option('autotools') == true
+if get_option('yelpm4') == true
   install_data(
     'yelp.m4',
     install_dir: join_paths(
-- 
cgit v1.2.1