aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/benchmark/taler-bank-benchmark.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index bbbce187f..eb78c891c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,7 +271,8 @@ AS_CASE([$with_gnunet],
[yes], [],
[no], [AC_MSG_ERROR([--with-gnunet is required])],
[LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
- CPPFLAGS="-I$with_gnunet/include ${CPPFLAGS} ${POSTGRESQL_CPPFLAGS}"])
+ CPPFLAGS="-I$with_gnunet/include ${CPPFLAGS}"])
+CPPFLAGS="${CPPFLAGS} ${POSTGRESQL_CPPFLAGS}"
AC_CHECK_HEADERS([gnunet/gnunet_pq_lib.h],
[AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_result_spec_string], libgnunetpq=1)])
AS_IF([test $libgnunetpq != 1],
diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c
index e13ee520b..aebf65d52 100644
--- a/src/benchmark/taler-bank-benchmark.c
+++ b/src/benchmark/taler-bank-benchmark.c
@@ -583,7 +583,8 @@ parallel_benchmark (void)
"taler-exchange-wirewatch",
"taler-exchange-wirewatch",
"-c", cfg_filename,
- "-L", loglev,
+ (NULL != loglev) ? "-L" : NULL,
+ loglev,
NULL);
if (NULL == wirewatch[w])
{
@@ -659,8 +660,9 @@ parallel_benchmark (void)
"taler-exchange-wirewatch",
"taler-exchange-wirewatch",
"-c", cfg_filename,
- "-L", loglev,
"-t",
+ (NULL != loglev) ? "-L" : NULL,
+ loglev,
NULL);
/* wait for it to finish! */
GNUNET_break (GNUNET_OK ==
@@ -684,8 +686,9 @@ parallel_benchmark (void)
"taler-exchange-wirewatch",
"taler-exchange-wirewatch",
"-c", cfg_filename,
- "-L", loglev,
"-t",
+ (NULL != loglev) ? "-L" : NULL,
+ loglev,
NULL);
/* wait for it to finish! */
GNUNET_break (GNUNET_OK ==