remove wallet-specific code
This commit is contained in:
Florian Dold
parent
8a08f73171
commit
a358360fb3
64
configure.ac
64
configure.ac
@ -61,17 +61,6 @@ CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS"
|
||||
AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h])
|
||||
|
||||
|
||||
# should the build process be restricted to the code required
|
||||
# for GNU Taler wallets?
|
||||
AC_MSG_CHECKING([whether to compile GNU Taler Wallet library ONLY])
|
||||
AC_ARG_ENABLE([wallet],
|
||||
[AS_HELP_STRING([--enable-wallet], [only compile for Taler wallet])],
|
||||
[wallet_only=${enableval}],
|
||||
[wallet_only=no])
|
||||
AC_MSG_RESULT($wallet_only)
|
||||
AM_CONDITIONAL([WALLET_ONLY], [test "x$wallet_only" = "xyes"])
|
||||
|
||||
|
||||
# Require minimum libgcrypt version
|
||||
need_libgcrypt_version=1.6.1
|
||||
AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], ["$need_libgcrypt_version"],
|
||||
@ -123,9 +112,6 @@ fd = epoll_create1(EPOLL_CLOEXEC);]])],
|
||||
AC_DEFINE([[HAVE_EPOLL_CREATE1]], [[1]], [Define if you have epoll_create1 function.])]))
|
||||
|
||||
|
||||
AS_IF([test "x$wallet_only" != xyes],[
|
||||
|
||||
|
||||
# Check for GNUnet's libgnunetutil.
|
||||
libgnunetutil=0
|
||||
AC_MSG_CHECKING([for libgnunetutil])
|
||||
@ -325,55 +311,6 @@ AS_IF([test $jansson = 0],
|
||||
AX_LIB_POSTGRESQL([9.3])
|
||||
AS_IF([test "x$found_postgresql" = "xyes"],[postgres=true])
|
||||
|
||||
|
||||
# true clause: test wallet-only set to false
|
||||
],[
|
||||
# false clause: for test wallet-only set to true
|
||||
|
||||
# Check for GNUnet's libgnunetutil_taler_wallet.
|
||||
|
||||
CFLAGS_SAVE=$CFLAGS
|
||||
LDFLAGS_SAVE=$LDFLAGS
|
||||
LIBS_SAVE=$LIBS
|
||||
CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS"
|
||||
LIBS="-lgcrypt -lgpg-error $LIBS"
|
||||
|
||||
|
||||
libgnunetutil_taler_wallet=0
|
||||
AC_MSG_CHECKING([for libgnunetutil_taler_wallet])
|
||||
AC_ARG_WITH(gnunet,
|
||||
[AS_HELP_STRING([--with-gnunet=PFX], [base of GNUnet installation])],
|
||||
[AC_MSG_RESULT([given as $with_gnunet])],
|
||||
[AC_MSG_RESULT(not given)
|
||||
with_gnunet=yes])
|
||||
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"])
|
||||
AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_taler_wallet_lib.h],
|
||||
[AC_CHECK_LIB([gnunetutil_taler_wallet], [GNUNET_CRYPTO_hash_context_start], libgnunetutil_taler_wallet=1)],
|
||||
[], [#ifdef HAVE_GNUNET_PLATFORM_H
|
||||
#include <gnunet/platform.h>
|
||||
#endif])
|
||||
AS_IF([test $libgnunetutil_taler_wallet != 1],
|
||||
[AC_MSG_ERROR([[
|
||||
***
|
||||
*** You need libgnunetutil_taler_wallet to build this program.
|
||||
*** This library is part of GNUnet, available at
|
||||
*** https://gnunet.org/
|
||||
*** Run GNUnet's configure with --enable-taler-wallet as well!
|
||||
*** ]])])
|
||||
|
||||
CFLAGS=$CFLAGS_SAVE
|
||||
LDFLAGS=$LDFLAGS_SAVE
|
||||
LIBS=$LIBS_SAVE
|
||||
|
||||
|
||||
# end of wallet/no-wallet specific logic
|
||||
])
|
||||
|
||||
TALER_LIB_LDFLAGS="-export-dynamic -no-undefined"
|
||||
TALER_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
|
||||
|
||||
@ -524,7 +461,6 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
|
||||
# logic if doc_only is set, make sure conditionals are still defined
|
||||
AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [false])
|
||||
AM_CONDITIONAL([MHD_HAVE_EPOLL], [false])
|
||||
AM_CONDITIONAL([WALLET_ONLY], [false])
|
||||
AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
|
||||
AM_CONDITIONAL([HAVE_LIBCURL], [false])
|
||||
AM_CONDITIONAL([HAVE_LIBGNURL], [false])
|
||||
|
||||
@ -11,10 +11,6 @@ if HAVE_LIBGNURL
|
||||
endif
|
||||
endif
|
||||
|
||||
if WALLET_ONLY
|
||||
SUBDIRS = include util
|
||||
else
|
||||
|
||||
pkgcfgdir = $(prefix)/share/taler/config.d/
|
||||
pkgcfg_DATA = \
|
||||
taler.conf
|
||||
@ -30,5 +26,3 @@ if HAVE_LIBGNURL
|
||||
SUBDIRS += lib benchmark
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
@ -1,15 +1,6 @@
|
||||
# This Makefile.am is in the public domain
|
||||
talerincludedir = $(includedir)/taler
|
||||
|
||||
if WALLET_ONLY
|
||||
talerinclude_HEADERS = \
|
||||
platform.h \
|
||||
taler_amount_lib.h \
|
||||
taler_crypto_lib.h \
|
||||
taler_util_wallet.h \
|
||||
taler_signatures.h
|
||||
else
|
||||
|
||||
talerinclude_HEADERS = \
|
||||
platform.h \
|
||||
taler_auditor_service.h \
|
||||
@ -32,8 +23,6 @@ talerinclude_HEADERS = \
|
||||
taler_pq_lib.h \
|
||||
taler_signatures.h
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
backoff.h \
|
||||
gauger.h
|
||||
|
||||
@ -22,13 +22,8 @@
|
||||
#ifndef TALER_CRYPTO_LIB_H
|
||||
#define TALER_CRYPTO_LIB_H
|
||||
|
||||
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
|
||||
#include <gnunet/gnunet_util_lib.h>
|
||||
#include "taler_util.h"
|
||||
#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
|
||||
#include <gnunet/gnunet_util_taler_wallet_lib.h>
|
||||
#include "taler_util_wallet.h"
|
||||
#endif
|
||||
|
||||
#include <gcrypt.h>
|
||||
|
||||
|
||||
@ -27,12 +27,7 @@
|
||||
#ifndef TALER_SIGNATURES_H
|
||||
#define TALER_SIGNATURES_H
|
||||
|
||||
#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
|
||||
#include <gnunet/gnunet_util_lib.h>
|
||||
#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
|
||||
#include <gnunet/gnunet_util_taler_wallet_lib.h>
|
||||
#endif
|
||||
|
||||
#include "taler_amount_lib.h"
|
||||
#include "taler_crypto_lib.h"
|
||||
|
||||
|
||||
@ -1,112 +0,0 @@
|
||||
/*
|
||||
This file is part of TALER
|
||||
Copyright (C) 2014, 2015 GNUnet e.V.
|
||||
|
||||
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
|
||||
Foundation; either version 3, or (at your option) any later version.
|
||||
|
||||
TALER is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
/**
|
||||
* @file include/taler_util_wallet.h
|
||||
* @brief Interface for common utility functions for wallets
|
||||
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
|
||||
*/
|
||||
#ifndef TALER_UTIL_H
|
||||
#define TALER_UTIL_H
|
||||
#include <gnunet/gnunet_util_taler_wallet_lib.h>
|
||||
#include "taler_amount_lib.h"
|
||||
#include "taler_crypto_lib.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#if 0 /* keep Emacsens' auto-indent happy */
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/* Define logging functions */
|
||||
#define TALER_LOG_DEBUG(...) \
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
|
||||
|
||||
#define TALER_LOG_WARNING(...) \
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, __VA_ARGS__)
|
||||
|
||||
#define TALER_LOG_ERROR(...) \
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__)
|
||||
|
||||
|
||||
/**
|
||||
* Tests a given as assertion and if failed prints it as a warning with the
|
||||
* given reason
|
||||
*
|
||||
* @param EXP the expression to test as assertion
|
||||
* @param reason string to print as warning
|
||||
*/
|
||||
#define TALER_assert_as(EXP, reason) \
|
||||
do { \
|
||||
if (EXP) break; \
|
||||
TALER_LOG_ERROR ("%s at %s:%d\n", reason, __FILE__, __LINE__); \
|
||||
abort (); \
|
||||
} while (0)
|
||||
|
||||
|
||||
/**
|
||||
* Log an error message at log-level 'level' that indicates
|
||||
* a failure of the command 'cmd' with the message given
|
||||
* by gcry_strerror(rc).
|
||||
*/
|
||||
#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR ( \
|
||||
"`%s' failed at %s:%d with error: %s\n", \
|
||||
cmd, __FILE__, __LINE__, \
|
||||
gcry_strerror (rc)); } while (0)
|
||||
|
||||
|
||||
#define TALER_gcry_ok(cmd) \
|
||||
do {int rc; rc = cmd; if (! rc) break; \
|
||||
TALER_LOG_ERROR ("A Gcrypt call failed at %s:%d with error: %s\n", \
|
||||
__FILE__, \
|
||||
__LINE__, gcry_strerror (rc)); abort (); } while (0)
|
||||
|
||||
|
||||
/**
|
||||
* Initialize Gcrypt library.
|
||||
*/
|
||||
void
|
||||
TALER_gcrypt_init (void);
|
||||
|
||||
|
||||
/**
|
||||
* Obtain denomination amount from configuration file.
|
||||
*
|
||||
* @param cfg configuration to parse
|
||||
* @param section section of the configuration to access
|
||||
* @param option option of the configuration to access
|
||||
* @param[out] denom set to the amount found in configuration
|
||||
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
|
||||
*/
|
||||
int
|
||||
TALER_config_get_denom (struct GNUNET_CONFIGURATION_Handle *cfg,
|
||||
const char *section,
|
||||
const char *option,
|
||||
struct TALER_Amount *denom);
|
||||
|
||||
|
||||
#if 0 /* keep Emacsens' auto-indent happy */
|
||||
{
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
@ -19,26 +19,8 @@ EXTRA_DIST = \
|
||||
bin_SCRIPTS = \
|
||||
taler-config
|
||||
|
||||
if WALLET_ONLY
|
||||
lib_LTLIBRARIES = \
|
||||
libtalerutil_wallet.la
|
||||
else
|
||||
lib_LTLIBRARIES = \
|
||||
libtalerutil.la
|
||||
endif
|
||||
|
||||
libtalerutil_wallet_la_SOURCES = \
|
||||
amount.c \
|
||||
crypto.c
|
||||
|
||||
libtalerutil_wallet_la_LIBADD = \
|
||||
-lgnunetutil_taler_wallet \
|
||||
$(LIBGCRYPT_LIBS) \
|
||||
$(XLIB)
|
||||
|
||||
libtalerutil_wallet_la_LDFLAGS = \
|
||||
-version-info 1:0:1 \
|
||||
-export-dynamic -no-undefined
|
||||
|
||||
libtalerutil_la_SOURCES = \
|
||||
amount.c \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user