From 5a525c0349701d8b511c34ef2deaf0eec7b26f22 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 1 Dec 2019 23:29:37 +0000 Subject: [PATCH] define HAVE_AWK... we require awk for many parts, but for some cases it could make sense to skip it. --- Makefile.am | 2 ++ configure.ac | 3 +++ contrib/scripts/Makefile.am | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index edcd28b92..f8725390e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,5 +70,7 @@ check-python: printf "Running flake8 and 2to3 if detected.\n" $(top_srcdir)/contrib/scripts/lint/lint-python.sh || true +if HAVE_AWK check-texinfo: @cd $(top_srcdir); find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 ./contrib/scripts/check-texinfo.awk > $(srcdir)/texinfo_lint.log || true +endif diff --git a/configure.ac b/configure.ac index e8a450b61..7de7b26fc 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,9 @@ AS_IF([test -x "$PERL"], # awk AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin ) AC_SUBST([AWK_BINARY]) +AS_IF([test -x "$AWK_BINARY"], + [AC_DEFINE_UNQUOTED([HAVE_AWK], [1], [Path to awk])], + [AC_DEFINE_UNQUOTED([HAVE_AWK], [0], [Path to awk])]) # should we install gnunet-logread? AC_MSG_CHECKING(whether to install gnunet-logread) diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am index b76e57db7..9416596c7 100644 --- a/contrib/scripts/Makefile.am +++ b/contrib/scripts/Makefile.am @@ -10,7 +10,14 @@ noinst_SCRIPTS = \ gnunet_pyexpect.py \ gnunet_janitor.py \ gnunet-chk.py \ + $(AWK_SCRIPTS) + +if HAVE_AWK +AWK_SCRIPTS = \ check-texinfo.awk +else +AWK_SCRIPTS = +endif bin_SCRIPTS = \ gnunet-bugreport \ @@ -49,6 +56,8 @@ SUFFIXES = .py.in .py $(do_subst) < $< > $@ chmod +x $@ +if HAVE_AWK check-texinfo.awk: check-texinfo.awk.in Makefile $(do_subst) < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk chmod +x check-texinfo.awk +endif -- 2.25.1