taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ensure Postgres CPPFLAGS are set before libgnunetpq check

Browse Source
This commit is contained in:
Christian Grothoff 2022-12-19 13:29:07 +01:00
parent a03e4fa72f
commit 24c0969873
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -271,7 +271,8 @@ AS_CASE([$with_gnunet],
[yes], [], [yes], [],
[no], [AC_MSG_ERROR([--with-gnunet is required])], [no], [AC_MSG_ERROR([--with-gnunet is required])],
[LDFLAGS="-L$with_gnunet/lib $LDFLAGS" [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_HEADERS([gnunet/gnunet_pq_lib.h],
[AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_result_spec_string], libgnunetpq=1)]) [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_result_spec_string], libgnunetpq=1)])
AS_IF([test $libgnunetpq != 1], AS_IF([test $libgnunetpq != 1],

9
src/benchmark/taler-bank-benchmark.c
View File

@ -583,7 +583,8 @@ parallel_benchmark (void)
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"-c", cfg_filename, "-c", cfg_filename,
"-L", loglev, (NULL != loglev) ? "-L" : NULL,
loglev,
NULL); NULL);
if (NULL == wirewatch[w]) if (NULL == wirewatch[w])
{ {
@ -659,8 +660,9 @@ parallel_benchmark (void)
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"-c", cfg_filename, "-c", cfg_filename,
"-L", loglev,
"-t", "-t",
(NULL != loglev) ? "-L" : NULL,
loglev,
NULL); NULL);
/* wait for it to finish! */ /* wait for it to finish! */
GNUNET_break (GNUNET_OK == GNUNET_break (GNUNET_OK ==
@ -684,8 +686,9 @@ parallel_benchmark (void)
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"-c", cfg_filename, "-c", cfg_filename,
"-L", loglev,
"-t", "-t",
(NULL != loglev) ? "-L" : NULL,
loglev,
NULL); NULL);
/* wait for it to finish! */ /* wait for it to finish! */
GNUNET_break (GNUNET_OK == GNUNET_break (GNUNET_OK ==