diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 19 | ||||
-rw-r--r-- | contrib/scripts/gnunet-logread/Makefile.am | 12 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread.in | 2 |
4 files changed, 33 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | Sun Dec 01 19:31:00 UTC 2019 | ||
2 | configure: Add --with-gnunet-logread. | ||
3 | -ng0 | ||
4 | |||
1 | Wed Oct 30 10:50:00 UTC 2019 | 5 | Wed Oct 30 10:50:00 UTC 2019 |
2 | Released gnunet 0.11.8 | 6 | Released gnunet 0.11.8 |
3 | -ng0 | 7 | -ng0 |
diff --git a/configure.ac b/configure.ac index 53db0bfaf..6471cb872 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -247,6 +247,25 @@ AC_PATH_PROG( PERL, perl, , | |||
247 | $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) | 247 | $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) |
248 | AC_SUBST([PERL]) | 248 | AC_SUBST([PERL]) |
249 | 249 | ||
250 | # should we install gnunet-logread? | ||
251 | AC_MSG_CHECKING(whether to install gnunet-logread) | ||
252 | AC_ARG_WITH([gnunet-logread], | ||
253 | [AS_HELP_STRING([--with-gnunet-logread], | ||
254 | [Install gnunet-logread])], | ||
255 | [logread=${withval}], | ||
256 | [logread=no]) | ||
257 | AC_MSG_RESULT($logread) | ||
258 | AS_IF([test "x$logread" = "xyes"], | ||
259 | [AM_CONDITIONAL([GNUNET_LOGREAD], true) | ||
260 | AC_DEFINE([GNUNET_LOGREAD], | ||
261 | [1], | ||
262 | [Installing gnunet-logread])], | ||
263 | [AM_CONDITIONAL([GNUNET_LOGREAD], | ||
264 | false) | ||
265 | AC_DEFINE([GNUNET_LOGREAD], | ||
266 | [0], | ||
267 | [Not installing gnunet-logread])]) | ||
268 | |||
250 | # iptables is a soft requirement to run tests | 269 | # iptables is a soft requirement to run tests |
251 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) | 270 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) |
252 | 271 | ||
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am index 790b58fea..e1183a885 100644 --- a/contrib/scripts/gnunet-logread/Makefile.am +++ b/contrib/scripts/gnunet-logread/Makefile.am | |||
@@ -1,7 +1,7 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include |
3 | 3 | ||
4 | do_subst = $(AWK) -v py="$(PERL)" '{gsub("@PERLEXE@",py); print $$0}' | 4 | do_subst = $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" '{if (/@SUBSTPREFIX@/) { gsub("@SUBSTPREFIX@",pfx)}; gsub("@PERLEXE@",prl); print $$0}' |
5 | 5 | ||
6 | SUFFIXES = .in | 6 | SUFFIXES = .in |
7 | 7 | ||
@@ -17,9 +17,15 @@ CLEANFILES= \ | |||
17 | gnunet-logread \ | 17 | gnunet-logread \ |
18 | gnunet-logread-ipc-sdedit | 18 | gnunet-logread-ipc-sdedit |
19 | 19 | ||
20 | if GNUNET_LOGREAD | ||
21 | bin_SCRIPTS = \ | ||
22 | gnunet-logread-ipc \ | ||
23 | $(CLEANFILES) | ||
24 | else | ||
20 | noinst_SCRIPTS = \ | 25 | noinst_SCRIPTS = \ |
21 | $(CLEANFILES) \ | 26 | gnunet-logread-ipc \ |
22 | gnunet-logread-ipc | 27 | $(CLEANFILES) |
28 | endif | ||
23 | 29 | ||
24 | EXTRA_DIST = \ | 30 | EXTRA_DIST = \ |
25 | gnunet-logread.in \ | 31 | gnunet-logread.in \ |
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread.in b/contrib/scripts/gnunet-logread/gnunet-logread.in index e27c1d3fc..ce588b8e6 100755 --- a/contrib/scripts/gnunet-logread/gnunet-logread.in +++ b/contrib/scripts/gnunet-logread/gnunet-logread.in | |||
@@ -29,7 +29,7 @@ my %levels = ( NONE => 0, ERROR => 1, WARNING => 2, INFO => 4, DEBUG => 8 ); | |||
29 | 29 | ||
30 | # Message type numbers to names | 30 | # Message type numbers to names |
31 | my %msgtypes; | 31 | my %msgtypes; |
32 | my $prefix = $ENV{GNUNET_PREFIX} || '/usr'; | 32 | my $prefix = $ENV{GNUNET_PREFIX} || '@SUBSTPREFIX@'; |
33 | my $filename = "$prefix/include/gnunet/gnunet_protocols.h"; | 33 | my $filename = "$prefix/include/gnunet/gnunet_protocols.h"; |
34 | $ipc = $opts{s} || $DEFAULT_SOCKET; | 34 | $ipc = $opts{s} || $DEFAULT_SOCKET; |
35 | 35 | ||