diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | contrib/scripts/Makefile.am | 7 |
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" != :]) | |||
247 | AC_PATH_PROG( PERL, perl, , | 247 | AC_PATH_PROG( PERL, perl, , |
248 | $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) | 248 | $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) |
249 | AC_SUBST([PERL]) | 249 | AC_SUBST([PERL]) |
250 | AM_CONDITIONAL([HAVE_PERL], [test -x "$PERL"]) | ||
250 | AS_IF([test -x "$PERL"], | 251 | AS_IF([test -x "$PERL"], |
251 | [AC_DEFINE_UNQUOTED([HAVE_PERL], [1], [Path to Perl])], | 252 | [AC_DEFINE_UNQUOTED([HAVE_PERL], [1], [Path to Perl])], |
252 | [AC_DEFINE_UNQUOTED([HAVE_PERL], [0], [Path to Perl])]) | 253 | [AC_DEFINE_UNQUOTED([HAVE_PERL], [0], [Path to Perl])]) |
@@ -254,6 +255,7 @@ AS_IF([test -x "$PERL"], | |||
254 | # awk | 255 | # awk |
255 | AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin ) | 256 | AC_PATH_PROGS( AWK_BINARY, [awk gawk], ,$PATH:/usr/bin/:/usr/local/bin ) |
256 | AC_SUBST([AWK_BINARY]) | 257 | AC_SUBST([AWK_BINARY]) |
258 | AM_CONDITIONAL([HAVE_AWK], [test -x "$AWK_BINARY"]) | ||
257 | AS_IF([test -x "$AWK_BINARY"], | 259 | AS_IF([test -x "$AWK_BINARY"], |
258 | [AC_DEFINE_UNQUOTED([HAVE_AWK], [1], [Path to awk])], | 260 | [AC_DEFINE_UNQUOTED([HAVE_AWK], [1], [Path to awk])], |
259 | [AC_DEFINE_UNQUOTED([HAVE_AWK], [0], [Path to awk])]) | 261 | [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 = \ | |||
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) | 13 | $(awkSCRIPTS) |
14 | 14 | ||
15 | # FIXME: read into AWK_SCRIPTS autotools builtin. | ||
15 | if HAVE_AWK | 16 | if HAVE_AWK |
16 | AWK_SCRIPTS = \ | 17 | awkSCRIPTS = \ |
17 | check-texinfo.awk | 18 | check-texinfo.awk |
18 | else | 19 | else |
19 | AWK_SCRIPTS = | 20 | awkSCRIPTS = |
20 | endif | 21 | endif |
21 | 22 | ||
22 | bin_SCRIPTS = \ | 23 | bin_SCRIPTS = \ |