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

-fix ftbfs in wallet-only mode

Browse Source
This commit is contained in:
Christian Grothoff 2015-07-15 11:40:51 +02:00
parent 6f6566554b
commit 3eddd802dc
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/taler_crypto_lib.h
View File

@ -22,7 +22,14 @@
#ifndef TALER_CRYPTO_LIB_H #ifndef TALER_CRYPTO_LIB_H
#define TALER_CRYPTO_LIB_H #define TALER_CRYPTO_LIB_H
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_util_lib.h>
#endif
#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
#include <gnunet/gnunet_util_taler_wallet_lib.h>
#endif
#include "taler_util_wallet.h"
#include <gcrypt.h> #include <gcrypt.h>

3
src/util/Makefile.am
View File

@ -16,8 +16,7 @@ endif
libtalerutil_wallet_la_SOURCES = \ libtalerutil_wallet_la_SOURCES = \
amount.c \ amount.c \
crypto.c \ crypto.c
util.c
libtalerutil_wallet_la_LIBADD = \ libtalerutil_wallet_la_LIBADD = \
-lgnunetutil_taler_wallet \ -lgnunetutil_taler_wallet \

5
src/util/amount.c
View File

@ -22,7 +22,12 @@
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include "platform.h"
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include "taler_util.h" #include "taler_util.h"
#endif
#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
#include "taler_util_wallet.h"
#endif
#include <gcrypt.h> #include <gcrypt.h>

5
src/util/crypto.c
View File

@ -22,13 +22,12 @@
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include "platform.h"
#include "taler_util.h"
#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H #if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
#include <gnunet/gnunet_util_taler_wallet_lib.h> #include "taler_util_wallet.h"
#endif #endif
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H #if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h> #include "taler_util.h"
#endif #endif
#include <gcrypt.h> #include <gcrypt.h>

6
src/util/util.c
View File

@ -24,12 +24,6 @@
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
#include <gnunet/gnunet_util_taler_wallet_lib.h>
#endif
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h>
#endif
#include <gcrypt.h> #include <gcrypt.h>