aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-01 23:29:37 +0000
committerng0 <ng0@n0.is>2019-12-01 23:29:37 +0000
commit5a525c0349701d8b511c34ef2deaf0eec7b26f22 (patch)
treead0a0a7224a35db6fca4de6364d44fafb8b6ce3d
parentdf0af6b7067e6a4ad0a88f2775da28cfc159ee66 (diff)
downloadgnunet-5a525c0349701d8b511c34ef2deaf0eec7b26f22.tar.gz
gnunet-5a525c0349701d8b511c34ef2deaf0eec7b26f22.zip
define HAVE_AWK... we require awk for many parts, but for some cases
it could make sense to skip it.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--contrib/scripts/Makefile.am9
3 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index edcd28b92..f8725390e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,5 +70,7 @@ check-python:
70 printf "Running flake8 and 2to3 if detected.\n" 70 printf "Running flake8 and 2to3 if detected.\n"
71 $(top_srcdir)/contrib/scripts/lint/lint-python.sh || true 71 $(top_srcdir)/contrib/scripts/lint/lint-python.sh || true
72 72
73if HAVE_AWK
73check-texinfo: 74check-texinfo:
74 @cd $(top_srcdir); find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 ./contrib/scripts/check-texinfo.awk > $(srcdir)/texinfo_lint.log || true 75 @cd $(top_srcdir); find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 ./contrib/scripts/check-texinfo.awk > $(srcdir)/texinfo_lint.log || true
76endif
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"],
254# awk 254# awk
255AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin ) 255AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin )
256AC_SUBST([AWK_BINARY]) 256AC_SUBST([AWK_BINARY])
257AS_IF([test -x "$AWK_BINARY"],
258 [AC_DEFINE_UNQUOTED([HAVE_AWK], [1], [Path to awk])],
259 [AC_DEFINE_UNQUOTED([HAVE_AWK], [0], [Path to awk])])
257 260
258# should we install gnunet-logread? 261# should we install gnunet-logread?
259AC_MSG_CHECKING(whether to install gnunet-logread) 262AC_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 = \
10 gnunet_pyexpect.py \ 10 gnunet_pyexpect.py \
11 gnunet_janitor.py \ 11 gnunet_janitor.py \
12 gnunet-chk.py \ 12 gnunet-chk.py \
13 $(AWK_SCRIPTS)
14
15if HAVE_AWK
16AWK_SCRIPTS = \
13 check-texinfo.awk 17 check-texinfo.awk
18else
19AWK_SCRIPTS =
20endif
14 21
15bin_SCRIPTS = \ 22bin_SCRIPTS = \
16 gnunet-bugreport \ 23 gnunet-bugreport \
@@ -49,6 +56,8 @@ SUFFIXES = .py.in .py
49 $(do_subst) < $< > $@ 56 $(do_subst) < $< > $@
50 chmod +x $@ 57 chmod +x $@
51 58
59if HAVE_AWK
52check-texinfo.awk: check-texinfo.awk.in Makefile 60check-texinfo.awk: check-texinfo.awk.in Makefile
53 $(do_subst) < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk 61 $(do_subst) < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
54 chmod +x check-texinfo.awk 62 chmod +x check-texinfo.awk
63endif