[gnunet] branch master updated (df0af6b70 -> 53f35813d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from df0af6b70 check-texinfo.awk: move comments to the moved code.
     new 5a525c034 define HAVE_AWK... we require awk for many parts, but for 
some cases it could make sense to skip it.
     new 53f35813d fix failure to build.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile.am                 |  2 ++
 configure.ac                |  5 +++++
 contrib/scripts/Makefile.am | 10 ++++++++++
 3 files changed, 17 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..99713a079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 AC_PATH_PROG( PERL, perl, ,
               $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
 AC_SUBST([PERL])
+AM_CONDITIONAL([HAVE_PERL], [test -x "$PERL"])
 AS_IF([test -x "$PERL"],
   [AC_DEFINE_UNQUOTED([HAVE_PERL], [1], [Path to Perl])],
   [AC_DEFINE_UNQUOTED([HAVE_PERL], [0], [Path to Perl])])
@@ -254,6 +255,10 @@ AS_IF([test -x "$PERL"],
 # awk
 AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST([AWK_BINARY])
+AM_CONDITIONAL([HAVE_AWK], [test -x "$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..f55bcabfe 100644
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -10,7 +10,15 @@ noinst_SCRIPTS = \
  gnunet_pyexpect.py \
  gnunet_janitor.py \
  gnunet-chk.py \
+ $(awkSCRIPTS)
+
+# FIXME: read into AWK_SCRIPTS autotools builtin.
+if HAVE_AWK
+awkSCRIPTS = \
  check-texinfo.awk
+else
+awkSCRIPTS =
+endif
 
 bin_SCRIPTS = \
  gnunet-bugreport \
@@ -49,6 +57,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

-- 
To stop receiving notification emails like this one, please contact
address@hidden.