From 3ef39e51f34f446831e136a38ed60bfa698b077c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 14 May 2021 18:08:45 +0200 Subject: more work on hopefully fixing #6862 --- configure.ac | 2 +- src/include/platform.h | 3 +++ src/util/taler-exchange-secmod-eddsa.c | 3 --- src/util/taler-exchange-secmod-rsa.c | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index e0284a515..9d4f1e76a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. # # This file is part of TALER -# Copyright (C) 2014, 2015, 2016, 2017, 2018 Taler Systems SA +# Copyright (C) 2014-2021 Taler Systems SA # # TALER is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software diff --git a/src/include/platform.h b/src/include/platform.h index ec2f70768..ba3a4d2c9 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -31,6 +31,9 @@ # include "taler_config.h" # endif #endif +/* For the exchange build, we do NOT want gettext, even + if it is available! */ +#undef ENABLE_NLS #if (GNUNET_EXTRA_LOGGING >= 1) diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c index 424fab63f..e2a71e6a9 100644 --- a/src/util/taler-exchange-secmod-eddsa.c +++ b/src/util/taler-exchange-secmod-eddsa.c @@ -32,9 +32,6 @@ * private key. This is done by reference counting (as work is always * assigned and collected by the main thread). */ -#include "taler_config.h" -#define HAVE_USED_CONFIG_H -#undef ENABLE_NLS #include "platform.h" #include "taler_util.h" #include "taler-exchange-secmod-eddsa.h" diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c index 941a3ddf3..0b2da99d7 100644 --- a/src/util/taler-exchange-secmod-rsa.c +++ b/src/util/taler-exchange-secmod-rsa.c @@ -32,9 +32,6 @@ * private key. This is done by reference counting (as work is always * assigned and collected by the main thread). */ -#include "taler_config.h" -#define HAVE_USED_CONFIG_H -#undef ENABLE_NLS #include "platform.h" #include "taler_util.h" #include "taler-exchange-secmod-rsa.h" -- cgit v1.2.3