[balsa] meson.build: Meson deprecation cleanup

[Peter Bloomfield <peterb src gnome org>]

commit 5b05874a9abbf893ee88e563b345b39ea0888b21
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Aug 18 15:02:08 2022 -0400

    meson.build: Meson deprecation cleanup
    
    modified:   libnetclient/meson.build
    modified:   libnetclient/test/meson.build
    modified:   meson.build

 libnetclient/meson.build      |  3 +--
 libnetclient/test/meson.build | 14 +++++++-------
 meson.build                   | 27 ++++++++++++---------------
 3 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/libnetclient/meson.build b/libnetclient/meson.build
index 1f57e283d..8574f0546 100644
--- a/libnetclient/meson.build
+++ b/libnetclient/meson.build
@@ -20,9 +20,8 @@ libnetclient_a = static_library('netclient', libnetclient_a_sources,
                                 install             : false)
 
 if libnetclient_docs
-  doxygen = doxygen_program.path()
   dox_path = join_paths(meson.source_root(), meson.current_source_dir(), 'libnetclient.dox')
-  run_command(doxygen, dox_path, check : true)
+  run_command(doxygen_program, dox_path, check : true)
 endif
 
 subdir('test')
diff --git a/libnetclient/test/meson.build b/libnetclient/test/meson.build
index 8ddcf29e5..e8aa8a7b1 100644
--- a/libnetclient/test/meson.build
+++ b/libnetclient/test/meson.build
@@ -47,22 +47,22 @@ if libnetclient_test
   vg_path    = join_paths(build_path, 'vg')
   supp_path  = join_paths(source_path, 'valgrind.supp')
   tests_path = join_paths(build_path, 'tests')
-  run_command(valgrind, [valgr_flags,
-                         '--suppressions=' + supp_path,
-                         '--log-file=' + vg_path,
-                         tests_path],
+  run_command(valgrind_program, [valgr_flags,
+                                 '--suppressions=' + supp_path,
+                                 '--log-file=' + vg_path,
+                                 tests_path],
               check : true)
 
   # lcov
   # Note: the following hack is needed so lcov recognises the paths of the sources...
   libsrcdir = join_paths(source_path, '..')
   lcov_out_path = join_paths(build_path, 'tests.covi')
-  run_command(lcov, ['-c', '-b', libsrcdir, '-d', source_path, '--no-external', '-o', lcov_out_path],
+  run_command(lcov_program, ['-c', '-b', libsrcdir, '-d', source_path, '--no-external', '-o', lcov_out_path],
               check : true)
-  run_command(lcov, ['-r', lcov_out_path, 'tests.c', '-o', lcov_out_path], check : true)
+  run_command(lcov_program, ['-r', lcov_out_path, 'tests.c', '-o', lcov_out_path], check : true)
 
   # genhtml
   html_out_path = join_paths(build_path, 'gcov')
-  run_command(genhtml, [genhtml_flags, '-o', html_out_path, lcov_out_path], check : true)
+  run_command(genhtml_program, [genhtml_flags, '-o', html_out_path, lcov_out_path], check : true)
 
 endif # libnetclient_test
diff --git a/meson.build b/meson.build
index 00a57a84f..ee71c6e0f 100644
--- a/meson.build
+++ b/meson.build
@@ -182,11 +182,16 @@ if html_widget == 'webkit2'
                            'html2text',
                            required : false)
   if html2text.found()
-    conf.set_quoted('HTML2TEXT', html2text.path(),
+    if meson.version().version_compare('>=0.55')
+      html2text_path = html2text.full_path()
+    else # meson.version().version_compare('>=0.55')
+      html2text_path = html2text.path()
+    endif # meson.version().version_compare('>=0.55')
+    conf.set_quoted('HTML2TEXT', html2text_path,
       description : 'Path to html2text program.')
     conftest_htm = join_paths(meson.current_build_dir(), 'conftest.htm')
     run_command('sh', '-c', 'echo "<html/>" > ' + conftest_htm, check : true)
-    unicode_snob = run_command(html2text.path(), '--unicode-snob', conftest_htm,
+    unicode_snob = run_command(html2text, '--unicode-snob', conftest_htm,
                                check : false)
     if unicode_snob.returncode() == 0
       conf.set('HTML2TEXT_UCOPT', 1,
@@ -297,16 +302,15 @@ endif # osmo
 # KRB5/GSSAPI configuration.
 #
 if gss
-  krb5_config_program = find_program('krb5-config',
-                                     '/usr/kerberos/bin/krb5-config',
-                                     '/usr/lib/mit/bin/krb5-config',
-                                     required : false)
-  if not krb5_config_program.found()
+  krb5_config = find_program('krb5-config',
+                             '/usr/kerberos/bin/krb5-config',
+                             '/usr/lib/mit/bin/krb5-config',
+                             required : false)
+  if not krb5_config.found()
     error('GSS requested but krb5-config not found. Install krb5-devel/heimdal-devel')
   endif
   conf.set('HAVE_GSSAPI', 1,
     description : 'Defined when GSSAPI support is to be compiled.')
-  krb5_config = krb5_config_program.path()
   krb5_cflags = run_command(krb5_config, ['--cflags', 'gssapi'], check : true).stdout().strip().split()
   krb5_libs   = run_command(krb5_config, ['--libs',   'gssapi'], check : true).stdout().strip().split()
   if compiler.has_header('gssapi.h')
@@ -524,13 +528,6 @@ if libnetclient_test
     error('*** Cannot run libnetclient tests, see libnetclient/README for fixing this issue ***')
   endif
 
-  valgrind    = valgrind_program.path()
-  lcov        = lcov_program.path()
-  genhtml     = genhtml_program.path()
-  screen      = screen_program.path()
-  gnutls_serv = gnutls_serv_program.path()
-  sudo        = sudo_program.path()
-  inetsim     = inetsim_program.path()
 endif # libnetclient_test
 
 #####################################################################