syntax-check: Detect awk the same as all other programs

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/build-aux/Makefile.in b/build-aux/Makefile.in
index 9ccbec7b1beb8a12ef755d42cb78f672cde592d9..7ee4680847a17f8340cc40f202d9d3c83ded464d 100644 (file)
--- 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 bbfa27c4c6ad716791ae2a04d6922e7d38bc7ca9..96562a4f4a22ebe66c3d7341c196f31fff5fa395 100644 (file)
--- 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 4573655074c7dd4820cc0a5e4bcf3110f74ade9e..13f565d1b8a74f4e5036fcd5d14381c8fb7deb82 100644 (file)
--- 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)