From 5177efb74f9301bbffd79d63f47eb78611e6abba Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 15 Jan 2020 19:41:05 +0100 Subject: remove Taler-specific leftovers, we don't need them anymore --- Makefile.am | 4 +-- configure.ac | 42 ++++------------------ src/Makefile.am | 8 ----- src/curl/curl.c | 2 +- src/include/Makefile.am | 14 -------- src/include/gnunet_curl_lib.h | 2 +- src/include/gnunet_util_taler_wallet_lib.h | 56 ------------------------------ src/util/Makefile.am | 32 ----------------- src/util/common_logging.c | 8 ++--- 9 files changed, 11 insertions(+), 157 deletions(-) delete mode 100644 src/include/gnunet_util_taler_wallet_lib.h diff --git a/Makefile.am b/Makefile.am index 62c46cb2b..f072d0cae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,7 @@ if INCLUDE_MANPAGES SUBDIRS += doc endif -if !TALER_ONLY - SUBDIRS += contrib -endif +SUBDIRS += contrib EXTRA_DIST = \ ABOUT-NLS \ diff --git a/configure.ac b/configure.ac index 98bd4ca70..23ca78dbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1026,23 +1026,6 @@ AC_CHECK_LIB([kvm],[kvm_open]) AC_CHECK_LIB([kstat],[kstat_open]) -# 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([taler-wallet], - [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])], - [taler_only=${enableval}], - [taler_only=no]) -AC_MSG_RESULT($taler_only) -AS_IF([test "x$taler_only" = "xyes"], -[ - AM_CONDITIONAL([TALER_ONLY],true) - AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) -],[ - AM_CONDITIONAL([TALER_ONLY],false) - AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) -]) - # test for libextractor extractor=0 AC_MSG_CHECKING(for libextractor) @@ -1081,9 +1064,6 @@ AS_IF([test "$extractor" != 1], ]) -AS_IF([test "$taler_only" != yes],[ - - # Check for libltdl header (#2999) ltdl=0 AC_MSG_CHECKING(for libltdl) @@ -1250,10 +1230,6 @@ AS_IF([test "$enable_shared" = "no"], LIBS=$SAVE_LIBS -# end of taler-only being false -]) - - # check for iconv AM_ICONV @@ -1262,12 +1238,8 @@ gl_LIBUNISTRING AS_IF([test $HAVE_LIBUNISTRING != yes], [AC_MSG_ERROR([GNUnet requires libunistring])]) -# under emscripten, $gl_libunistring_hexversion is undefined -if test "$taler_only" != yes; then - AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305], [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) -fi AC_CHECK_HEADERS([unistr.h], , AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) @@ -1340,14 +1312,12 @@ CPPFLAGS=$SAVE_CPPFLAGS # test for postgres: postgres=false -# even running the check for postgres breaks emscripten -AS_IF([test "$taler_only" != yes], - [AX_LIB_POSTGRESQL([9.5], - [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" - AC_CHECK_HEADERS([libpq-fe.h], - postgres=true) - ], - [AC_MSG_RESULT([no postgres])])]) +AX_LIB_POSTGRESQL([9.5], + [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADERS([libpq-fe.h], + postgres=true) + ], + [AC_MSG_RESULT([no postgres])]) AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) AS_IF([test "x$postgres" = xtrue], diff --git a/src/Makefile.am b/src/Makefile.am index 1bcc1ae7b..7b73a4bb8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,12 +66,6 @@ endif endif -if TALER_ONLY -SUBDIRS = \ - include \ - util -else - SUBDIRS = \ include $(INTLEMU_SUBDIRS) \ util \ @@ -128,5 +122,3 @@ SUBDIRS = \ $(RECLAIM_DIR) \ $(EXP_DIR) \ integration-tests - -endif diff --git a/src/curl/curl.c b/src/curl/curl.c index dcbb43f58..82eb28ed9 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -680,7 +680,7 @@ do_benchmark (CURLMsg *cmsg) /** - * Run the main event loop for the Taler interaction. + * Run the main event loop for the HTTP interaction. * * @param ctx the library context * @param rp parses the raw response returned from diff --git a/src/include/Makefile.am b/src/include/Makefile.am index d79bc45b6..b53f2420d 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -9,18 +9,6 @@ EXTRA_DIST = \ block_dns.h \ block_regex.h -if TALER_ONLY -gnunetinclude_HEADERS = \ - platform.h gettext.h \ - gnunet_buffer_lib.h \ - gnunet_common.h \ - gnunet_container_lib.h \ - gnunet_crypto_lib.h \ - gnunet_strings_lib.h \ - gnunet_time_lib.h \ - gnunet_util_taler_wallet_lib.h -else - gnunetinclude_HEADERS = \ platform.h gettext.h \ compat.h \ @@ -132,5 +120,3 @@ gnunetinclude_HEADERS = \ gnunet_tun_lib.h \ gnunet_util_lib.h \ gnunet_vpn_service.h - -endif diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index 48eb7e490..8e981e91e 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h @@ -164,7 +164,7 @@ GNUNET_CURL_perform (struct GNUNET_CURL_Context *ctx); /** - * Run the main event loop for the Taler interaction. + * Run the main event loop for the HTTP interaction. * * @param ctx the library context * @param rp parses the raw response returned from diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h deleted file mode 100644 index a036824f6..000000000 --- a/src/include/gnunet_util_taler_wallet_lib.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - This file is part of GNUnet - Copyright (C) 2009, 2015 GNUnet e.V. - - GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, - or (at your option) any later version. - - GNUnet 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 - Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - - SPDX-License-Identifier: AGPL3.0-or-later - */ - -/** - * @author Christian Grothoff - * - * @file - * Convenience header including all headers of subsystems in - * gnunet_util_taler_wallet library. Note that (due to the structure of the - * original headers), not all symbols declared by the included headers are - * actually included in the gnunet_util_taler_wallet library! The library - * excludes anything relating to the GNUnet installation location, scheduler, - * networking or OS-specific logic that would not apply to Apps/Browser - * extensions. - */ - -#ifndef GNUNET_UTIL_TALER_WALLET_LIB_H -#define GNUNET_UTIL_TALER_WALLET_LIB_H - -#ifdef __cplusplus -extern "C" -{ -#if 0 /* keep Emacsens' auto-indent happy */ -} -#endif -#endif - -#include "gnunet_crypto_lib.h" -#include "gnunet_container_lib.h" -#include "gnunet_strings_lib.h" - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 7d347424b..fc8f424dc 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -139,41 +139,11 @@ libgnunetutil_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 13:2:0 -libgnunetutil_taler_wallet_la_SOURCES = \ - common_allocation.c \ - common_endian.c \ - common_logging.c \ - container_heap.c \ - container_multihashmap.c \ - container_multihashmap32.c \ - crypto_symmetric.c \ - crypto_crc.c \ - crypto_ecc.c \ - crypto_hash.c \ - crypto_hkdf.c \ - crypto_kdf.c \ - crypto_mpi.c \ - crypto_random.c \ - crypto_rsa.c \ - strings.c \ - time.c - -libgnunetutil_taler_wallet_la_LIBADD = \ - $(LIBGCRYPT_LIBS) \ - -lunistring - -libgnunetutil_taler_wallet_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) \ - -version-info 0:0:0 - if HAVE_TESTING GNUNET_ECC = gnunet-ecc GNUNET_SCRYPT = gnunet-scrypt endif -if TALER_ONLY -lib_LTLIBRARIES = libgnunetutil_taler_wallet.la -else lib_LTLIBRARIES = libgnunetutil.la libexec_PROGRAMS = \ @@ -201,8 +171,6 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT TESTS = $(check_PROGRAMS) endif -endif - gnunet_timeout_SOURCES = \ gnunet-timeout.c diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 430f75e70..27ac88a05 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -294,7 +294,6 @@ resize_logdefs () } -#if ! TALER_WALLET_ONLY /** * Rotate logs, deleting the oldest log. * @@ -403,9 +402,6 @@ setup_log_file (const struct tm *tm) } -#endif - - /** * Utility function - adds a parsed definition to logdefs array. * @@ -731,7 +727,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile) log_file_name = GNUNET_STRINGS_filename_expand (logfile); if (NULL == log_file_name) return GNUNET_SYSERR; -#if TALER_WALLET_ONLY || defined(GNUNET_CULL_LOGGING) +#if defined(GNUNET_CULL_LOGGING) /* log file option not allowed for wallet logic */ GNUNET_assert (NULL == logfile); return GNUNET_OK; @@ -1023,7 +1019,7 @@ mylog (enum GNUNET_ErrorType kind, } vsnprintf (buf, size, message, va); -#if ! (defined(GNUNET_CULL_LOGGING) || TALER_WALLET_ONLY) +#if ! defined(GNUNET_CULL_LOGGING) if (NULL != tmptr) (void) setup_log_file (tmptr); #endif -- cgit v1.2.3