commit 40c909f534e3f3cd2bcb797b95f96d52e6dd5cdf
author Paolo Bonzini <pbonzini@redhat.com> Wed Apr 20 17:33:49 2022 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Sat May 07 07:46:58 2022 +0200
tree 3847d413d82d98ad5f813d4cd551bbf77329f56a
parent 14efd8d3b5fee7027f0ee072aea6620e0655774f

configure, meson: move iasl detection to meson

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

configure

diff --git a/configure b/configure
index 5199828..b146763 100755
--- a/configure
+++ b/configure
@@ -2508,7 +2508,7 @@
         -Daudio_drv_list=$audio_drv_list \
         -Ddefault_devices=$default_devices \
         -Ddocdir="$docdir" \
-        -Diasl="$($iasl -h >/dev/null 2>&1 && printf %s "$iasl")" \
+        -Diasl="$iasl" \
         -Dqemu_firmwarepath="$firmwarepath" \
         -Dqemu_suffix="$qemu_suffix" \
         -Dsmbd="$smbd" \

meson.build

diff --git a/meson.build b/meson.build
index 2d54513..448a8dd 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,12 @@
   endif
 endif
 
+if get_option('iasl') == ''
+  iasl = find_program('iasl', required: false)
+else
+  iasl = find_program(get_option('iasl'), required: true)
+endif
+
 ##################
 # Compiler flags #
 ##################
@@ -1584,8 +1590,8 @@
   config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
 endforeach
 config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
-if get_option('iasl') != ''
-  config_host_data.set_quoted('CONFIG_IASL', get_option('iasl'))
+if iasl.found()
+  config_host_data.set_quoted('CONFIG_IASL', iasl.full_path())
 endif
 config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
 config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
@@ -3631,11 +3637,7 @@
 if config_host.has_key('HAVE_GDB_BIN')
   summary_info += {'gdb':             config_host['HAVE_GDB_BIN']}
 endif
-if get_option('iasl') != ''
-  summary_info += {'iasl':            get_option('iasl')}
-else
-  summary_info += {'iasl':            false}
-endif
+summary_info += {'iasl':              iasl}
 summary_info += {'genisoimage':       config_host['GENISOIMAGE']}
 if targetos == 'windows' and have_ga
   summary_info += {'wixl':            wixl}