aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-01 20:37:57 +0000
committerng0 <ng0@n0.is>2019-12-01 20:37:57 +0000
commit93330d9c6d8d5c599a2f12d641c5029aab91d3ad (patch)
tree47589f150fb56be88742ba48e6d589a0e105ab3f
parent24d9ece906cc03e80db617168c9a2d93409e4640 (diff)
downloadgnunet-93330d9c6d8d5c599a2f12d641c5029aab91d3ad.tar.gz
gnunet-93330d9c6d8d5c599a2f12d641c5029aab91d3ad.zip
gnunet-logread: install only when perl has been found (avoid dysfunctional SHa-bang line.
-rw-r--r--configure.ac4
-rw-r--r--contrib/scripts/gnunet-logread/Makefile.am2
2 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 6471cb872..ad59c9231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,10 +242,14 @@ AM_PATH_PYTHON([3.4],, [:])
242AC_SUBST([PYTHON]) 242AC_SUBST([PYTHON])
243AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) 243AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
244 244
245
245# perl 246# perl
246AC_PATH_PROG( PERL, perl, , 247AC_PATH_PROG( PERL, perl, ,
247 $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) 248 $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
248AC_SUBST([PERL]) 249AC_SUBST([PERL])
250AS_IF([test -x "$PERL"],
251 [AC_DEFINE_UNQUOTED([HAVE_PERL], [1], [Path to Perl])],
252 [AC_DEFINE_UNQUOTED([HAVE_PERL], [0], [Path to Perl])])
249 253
250# should we install gnunet-logread? 254# should we install gnunet-logread?
251AC_MSG_CHECKING(whether to install gnunet-logread) 255AC_MSG_CHECKING(whether to install gnunet-logread)
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
index e1183a885..aa92dfe16 100644
--- a/contrib/scripts/gnunet-logread/Makefile.am
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -18,6 +18,7 @@ CLEANFILES= \
18 gnunet-logread-ipc-sdedit 18 gnunet-logread-ipc-sdedit
19 19
20if GNUNET_LOGREAD 20if GNUNET_LOGREAD
21if HAVE_PERL
21bin_SCRIPTS = \ 22bin_SCRIPTS = \
22 gnunet-logread-ipc \ 23 gnunet-logread-ipc \
23 $(CLEANFILES) 24 $(CLEANFILES)
@@ -26,6 +27,7 @@ noinst_SCRIPTS = \
26 gnunet-logread-ipc \ 27 gnunet-logread-ipc \
27 $(CLEANFILES) 28 $(CLEANFILES)
28endif 29endif
30endif
29 31
30EXTRA_DIST = \ 32EXTRA_DIST = \
31 gnunet-logread.in \ 33 gnunet-logread.in \