[taler-exchange] branch master updated: ensure Postgres CPPFLAGS are set before libgnunetpq check

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 24c09698 ensure Postgres CPPFLAGS are set before libgnunetpq check
24c09698 is described below

commit 24c0969873d81b9a0ba55e59d71d8beb19db3bb2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Dec 19 13:29:07 2022 +0100

    ensure Postgres CPPFLAGS are set before libgnunetpq check
---
 configure.ac                         | 3 ++-
 src/benchmark/taler-bank-benchmark.c | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index bbbce187..eb78c891 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 e13ee520..aebf65d5 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 ==

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.