[libvirt PATCH 09/13] syntax-check: Detect awk the same as all other programs

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- build-aux/Makefile.in | 1 + build-aux/meson.build | 3 +++ build-aux/syntax-check.mk | 5 ----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-aux/Makefile.in b/build-aux/Makefile.in index 9ccbec7b1b..7ee4680847 100644 --- a/build-aux/Makefile.in +++ b/build-aux/Makefile.in @@ -7,6 +7,7 @@ RUNUTF8 = @runutf8@ PYTHON = @PYTHON3@ GREP = @GREP@ SED = @SED@ +AWK = @AWK@ # include syntax-check.mk file include $(top_srcdir)/build-aux/syntax-check.mk diff --git a/build-aux/meson.build b/build-aux/meson.build index bbfa27c4c6..96562a4f4a 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -26,6 +26,8 @@ else grep_prog = find_program('grep') endif +awk_prog = find_program('awk') + syntax_check_conf = configuration_data({ 'top_srcdir': meson.source_root(), 'top_builddir': meson.build_root(), @@ -34,6 +36,7 @@ syntax_check_conf = configuration_data({ 'PYTHON3': python3_prog.path(), 'GREP': grep_prog.path(), 'SED': sed_prog.path(), + 'AWK': awk_prog.path(), }) configure_file( diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 4573655074..13f565d1b8 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -19,11 +19,6 @@ # along with this program. If not, see # <http://www.gnu.org/licenses/>;. -# These variables ought to be defined through the configure.ac section -# of the module description. But some packages import this file directly, -# ignoring the module description. -AWK ?= awk - # Helper variables. _empty = _sp = $(_empty) $(_empty) -- 2.35.3