summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--contrib/scripts/Makefile.am7
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7de7b26fc..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,7 @@ 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])])
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index 9416596c7..f55bcabfe 100644
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -10,13 +10,14 @@ noinst_SCRIPTS = \
gnunet_pyexpect.py \
gnunet_janitor.py \
gnunet-chk.py \
- $(AWK_SCRIPTS)
+ $(awkSCRIPTS)
+# FIXME: read into AWK_SCRIPTS autotools builtin.
if HAVE_AWK
-AWK_SCRIPTS = \
+awkSCRIPTS = \
check-texinfo.awk
else
-AWK_SCRIPTS =
+awkSCRIPTS =
endif
bin_SCRIPTS = \