projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a525c0
)
fix failure to build.
author
ng0
<ng0@n0.is>
Sun, 1 Dec 2019 23:38:19 +0000
(23:38 +0000)
committer
ng0
<ng0@n0.is>
Sun, 1 Dec 2019 23:38:19 +0000
(23:38 +0000)
configure.ac
patch
|
blob
|
history
contrib/scripts/Makefile.am
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 7de7b26fc17654ac15d7e7d9f34163abb6256b00..99713a079045ee7a3e01425e5f6290a042657273 100644
(file)
--- 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])
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])])
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])
# 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])])
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 9416596c7cb9104628f5034282c5b0e1b8db41ab..f55bcabfe43a2dbbfa8acb61ceaf20efe755af37 100644
(file)
--- 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 \
gnunet_pyexpect.py \
gnunet_janitor.py \
gnunet-chk.py \
- $(
AWK_
SCRIPTS)
+ $(
awk
SCRIPTS)
+# FIXME: read into AWK_SCRIPTS autotools builtin.
if HAVE_AWK
if HAVE_AWK
-
AWK_
SCRIPTS = \
+
awk
SCRIPTS = \
check-texinfo.awk
else
check-texinfo.awk
else
-
AWK_
SCRIPTS =
+
awk
SCRIPTS =
endif
bin_SCRIPTS = \
endif
bin_SCRIPTS = \