aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-01-15 19:41:05 +0100
committerFlorian Dold <florian.dold@gmail.com>2020-01-15 19:41:05 +0100
commit5177efb74f9301bbffd79d63f47eb78611e6abba (patch)
tree3b934e877911bb4d40fceca920ef70e272f19488
parent9f36b6e9ef86d595b229c1c8f0671b63a18bdc03 (diff)
downloadgnunet-5177efb74f9301bbffd79d63f47eb78611e6abba.tar.gz
gnunet-5177efb74f9301bbffd79d63f47eb78611e6abba.zip
remove Taler-specific leftovers, we don't need them anymore
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac42
-rw-r--r--src/Makefile.am8
-rw-r--r--src/curl/curl.c2
-rw-r--r--src/include/Makefile.am14
-rw-r--r--src/include/gnunet_curl_lib.h2
-rw-r--r--src/include/gnunet_util_taler_wallet_lib.h56
-rw-r--r--src/util/Makefile.am32
-rw-r--r--src/util/common_logging.c8
9 files changed, 11 insertions, 157 deletions
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
18 SUBDIRS += doc 18 SUBDIRS += doc
19endif 19endif
20 20
21if !TALER_ONLY 21SUBDIRS += contrib
22 SUBDIRS += contrib
23endif
24 22
25EXTRA_DIST = \ 23EXTRA_DIST = \
26 ABOUT-NLS \ 24 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])
1026AC_CHECK_LIB([kstat],[kstat_open]) 1026AC_CHECK_LIB([kstat],[kstat_open])
1027 1027
1028 1028
1029# should the build process be restricted to the code required
1030# for GNU Taler wallets?
1031AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY)
1032AC_ARG_ENABLE([taler-wallet],
1033 [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])],
1034 [taler_only=${enableval}],
1035 [taler_only=no])
1036AC_MSG_RESULT($taler_only)
1037AS_IF([test "x$taler_only" = "xyes"],
1038[
1039 AM_CONDITIONAL([TALER_ONLY],true)
1040 AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet])
1041],[
1042 AM_CONDITIONAL([TALER_ONLY],false)
1043 AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation])
1044])
1045
1046# test for libextractor 1029# test for libextractor
1047extractor=0 1030extractor=0
1048AC_MSG_CHECKING(for libextractor) 1031AC_MSG_CHECKING(for libextractor)
@@ -1081,9 +1064,6 @@ AS_IF([test "$extractor" != 1],
1081 ]) 1064 ])
1082 1065
1083 1066
1084AS_IF([test "$taler_only" != yes],[
1085
1086
1087# Check for libltdl header (#2999) 1067# Check for libltdl header (#2999)
1088ltdl=0 1068ltdl=0
1089AC_MSG_CHECKING(for libltdl) 1069AC_MSG_CHECKING(for libltdl)
@@ -1250,10 +1230,6 @@ AS_IF([test "$enable_shared" = "no"],
1250LIBS=$SAVE_LIBS 1230LIBS=$SAVE_LIBS
1251 1231
1252 1232
1253# end of taler-only being false
1254])
1255
1256
1257# check for iconv 1233# check for iconv
1258AM_ICONV 1234AM_ICONV
1259 1235
@@ -1262,12 +1238,8 @@ gl_LIBUNISTRING
1262AS_IF([test $HAVE_LIBUNISTRING != yes], 1238AS_IF([test $HAVE_LIBUNISTRING != yes],
1263 [AC_MSG_ERROR([GNUnet requires libunistring])]) 1239 [AC_MSG_ERROR([GNUnet requires libunistring])])
1264 1240
1265# under emscripten, $gl_libunistring_hexversion is undefined
1266if test "$taler_only" != yes; then
1267
1268AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305], 1241AS_IF([test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305],
1269 [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) 1242 [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])])
1270fi
1271AC_CHECK_HEADERS([unistr.h], 1243AC_CHECK_HEADERS([unistr.h],
1272 , 1244 ,
1273 AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed])) 1245 AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
@@ -1340,14 +1312,12 @@ CPPFLAGS=$SAVE_CPPFLAGS
1340 1312
1341# test for postgres: 1313# test for postgres:
1342postgres=false 1314postgres=false
1343# even running the check for postgres breaks emscripten 1315AX_LIB_POSTGRESQL([9.5],
1344AS_IF([test "$taler_only" != yes], 1316 [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
1345 [AX_LIB_POSTGRESQL([9.5], 1317 AC_CHECK_HEADERS([libpq-fe.h],
1346 [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" 1318 postgres=true)
1347 AC_CHECK_HEADERS([libpq-fe.h], 1319 ],
1348 postgres=true) 1320 [AC_MSG_RESULT([no postgres])])
1349 ],
1350 [AC_MSG_RESULT([no postgres])])])
1351 1321
1352AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) 1322AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
1353AS_IF([test "x$postgres" = xtrue], 1323AS_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
66endif 66endif
67 67
68 68
69if TALER_ONLY
70SUBDIRS = \
71 include \
72 util
73else
74
75SUBDIRS = \ 69SUBDIRS = \
76 include $(INTLEMU_SUBDIRS) \ 70 include $(INTLEMU_SUBDIRS) \
77 util \ 71 util \
@@ -128,5 +122,3 @@ SUBDIRS = \
128 $(RECLAIM_DIR) \ 122 $(RECLAIM_DIR) \
129 $(EXP_DIR) \ 123 $(EXP_DIR) \
130 integration-tests 124 integration-tests
131
132endif
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)
680 680
681 681
682/** 682/**
683 * Run the main event loop for the Taler interaction. 683 * Run the main event loop for the HTTP interaction.
684 * 684 *
685 * @param ctx the library context 685 * @param ctx the library context
686 * @param rp parses the raw response returned from 686 * @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 = \
9 block_dns.h \ 9 block_dns.h \
10 block_regex.h 10 block_regex.h
11 11
12if TALER_ONLY
13gnunetinclude_HEADERS = \
14 platform.h gettext.h \
15 gnunet_buffer_lib.h \
16 gnunet_common.h \
17 gnunet_container_lib.h \
18 gnunet_crypto_lib.h \
19 gnunet_strings_lib.h \
20 gnunet_time_lib.h \
21 gnunet_util_taler_wallet_lib.h
22else
23
24gnunetinclude_HEADERS = \ 12gnunetinclude_HEADERS = \
25 platform.h gettext.h \ 13 platform.h gettext.h \
26 compat.h \ 14 compat.h \
@@ -132,5 +120,3 @@ gnunetinclude_HEADERS = \
132 gnunet_tun_lib.h \ 120 gnunet_tun_lib.h \
133 gnunet_util_lib.h \ 121 gnunet_util_lib.h \
134 gnunet_vpn_service.h 122 gnunet_vpn_service.h
135
136endif
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);
164 164
165 165
166/** 166/**
167 * Run the main event loop for the Taler interaction. 167 * Run the main event loop for the HTTP interaction.
168 * 168 *
169 * @param ctx the library context 169 * @param ctx the library context
170 * @param rp parses the raw response returned from 170 * @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 @@
1/*
2 This file is part of GNUnet
3 Copyright (C) 2009, 2015 GNUnet e.V.
4
5 GNUnet is free software: you can redistribute it and/or modify it
6 under the terms of the GNU Affero General Public License as published
7 by the Free Software Foundation, either version 3 of the License,
8 or (at your option) any later version.
9
10 GNUnet is distributed in the hope that it will be useful, but
11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details.
14
15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18 SPDX-License-Identifier: AGPL3.0-or-later
19 */
20
21/**
22 * @author Christian Grothoff
23 *
24 * @file
25 * Convenience header including all headers of subsystems in
26 * gnunet_util_taler_wallet library. Note that (due to the structure of the
27 * original headers), not all symbols declared by the included headers are
28 * actually included in the gnunet_util_taler_wallet library! The library
29 * excludes anything relating to the GNUnet installation location, scheduler,
30 * networking or OS-specific logic that would not apply to Apps/Browser
31 * extensions.
32 */
33
34#ifndef GNUNET_UTIL_TALER_WALLET_LIB_H
35#define GNUNET_UTIL_TALER_WALLET_LIB_H
36
37#ifdef __cplusplus
38extern "C"
39{
40#if 0 /* keep Emacsens' auto-indent happy */
41}
42#endif
43#endif
44
45#include "gnunet_crypto_lib.h"
46#include "gnunet_container_lib.h"
47#include "gnunet_strings_lib.h"
48
49#if 0 /* keep Emacsens' auto-indent happy */
50{
51#endif
52#ifdef __cplusplus
53}
54#endif
55
56#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 = \
139 $(GN_LIB_LDFLAGS) \ 139 $(GN_LIB_LDFLAGS) \
140 -version-info 13:2:0 140 -version-info 13:2:0
141 141
142libgnunetutil_taler_wallet_la_SOURCES = \
143 common_allocation.c \
144 common_endian.c \
145 common_logging.c \
146 container_heap.c \
147 container_multihashmap.c \
148 container_multihashmap32.c \
149 crypto_symmetric.c \
150 crypto_crc.c \
151 crypto_ecc.c \
152 crypto_hash.c \
153 crypto_hkdf.c \
154 crypto_kdf.c \
155 crypto_mpi.c \
156 crypto_random.c \
157 crypto_rsa.c \
158 strings.c \
159 time.c
160
161libgnunetutil_taler_wallet_la_LIBADD = \
162 $(LIBGCRYPT_LIBS) \
163 -lunistring
164
165libgnunetutil_taler_wallet_la_LDFLAGS = \
166 $(GN_LIB_LDFLAGS) \
167 -version-info 0:0:0
168
169if HAVE_TESTING 142if HAVE_TESTING
170 GNUNET_ECC = gnunet-ecc 143 GNUNET_ECC = gnunet-ecc
171 GNUNET_SCRYPT = gnunet-scrypt 144 GNUNET_SCRYPT = gnunet-scrypt
172endif 145endif
173 146
174if TALER_ONLY
175lib_LTLIBRARIES = libgnunetutil_taler_wallet.la
176else
177lib_LTLIBRARIES = libgnunetutil.la 147lib_LTLIBRARIES = libgnunetutil.la
178 148
179libexec_PROGRAMS = \ 149libexec_PROGRAMS = \
@@ -201,8 +171,6 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT
201TESTS = $(check_PROGRAMS) 171TESTS = $(check_PROGRAMS)
202endif 172endif
203 173
204endif
205
206gnunet_timeout_SOURCES = \ 174gnunet_timeout_SOURCES = \
207 gnunet-timeout.c 175 gnunet-timeout.c
208 176
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 ()
294} 294}
295 295
296 296
297#if ! TALER_WALLET_ONLY
298/** 297/**
299 * Rotate logs, deleting the oldest log. 298 * Rotate logs, deleting the oldest log.
300 * 299 *
@@ -403,9 +402,6 @@ setup_log_file (const struct tm *tm)
403} 402}
404 403
405 404
406#endif
407
408
409/** 405/**
410 * Utility function - adds a parsed definition to logdefs array. 406 * Utility function - adds a parsed definition to logdefs array.
411 * 407 *
@@ -731,7 +727,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
731 log_file_name = GNUNET_STRINGS_filename_expand (logfile); 727 log_file_name = GNUNET_STRINGS_filename_expand (logfile);
732 if (NULL == log_file_name) 728 if (NULL == log_file_name)
733 return GNUNET_SYSERR; 729 return GNUNET_SYSERR;
734#if TALER_WALLET_ONLY || defined(GNUNET_CULL_LOGGING) 730#if defined(GNUNET_CULL_LOGGING)
735 /* log file option not allowed for wallet logic */ 731 /* log file option not allowed for wallet logic */
736 GNUNET_assert (NULL == logfile); 732 GNUNET_assert (NULL == logfile);
737 return GNUNET_OK; 733 return GNUNET_OK;
@@ -1023,7 +1019,7 @@ mylog (enum GNUNET_ErrorType kind,
1023 } 1019 }
1024 1020
1025 vsnprintf (buf, size, message, va); 1021 vsnprintf (buf, size, message, va);
1026#if ! (defined(GNUNET_CULL_LOGGING) || TALER_WALLET_ONLY) 1022#if ! defined(GNUNET_CULL_LOGGING)
1027 if (NULL != tmptr) 1023 if (NULL != tmptr)
1028 (void) setup_log_file (tmptr); 1024 (void) setup_log_file (tmptr);
1029#endif 1025#endif