[taler-donau] branch master updated: no need

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new 434b995  no need
434b995 is described below

commit 434b995f0172b799fad391abd2f81f662fcc6ce9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Oct 24 10:32:58 2023 +0200

    no need
---
 configure.ac            | 51 ----------------------------------
 doc/doxygen/Makefile.in |  2 --
 src/Makefile.am         | 27 ------------------
 src/testing/Makefile.am | 73 -------------------------------------------------
 taler_config.h.in       |  6 ----
 5 files changed, 159 deletions(-)

diff --git a/configure.ac b/configure.ac
index 96ca136..3b250b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,6 @@ AC_SUBST(TALER_PLUGIN_LDFLAGS)
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h sys/socket.h sys/un.h 
netinet/in.h netinet/ip.h])
 
-AX_PYTHON_MODULE([jinja2],true)
-
 
 # Require minimum libgcrypt version
 need_libgcrypt_version=1.6.1
@@ -336,53 +334,6 @@ CFLAGS=$CFLAGS_SAVE
 LDFLAGS=$LDFLAGS_SAVE
 LIBS=$LIBS_SAVE
 
-# test for sqlite
-sqlite=false
-AC_MSG_CHECKING(for SQLite)
-AC_ARG_WITH(sqlite,
-  [  --with-sqlite=PFX       base of SQLite installation],
-  [AC_MSG_RESULT("$with_sqlite")
-   AS_CASE([$with_sqlite],
-     [no],[],
-     [yes],[
-      AC_CHECK_HEADERS(sqlite3.h,
-      sqlite=true)],
-     [
-    LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
-    CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
-    AC_CHECK_HEADERS(sqlite3.h,
-     EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH"
-     SQLITE_LDFLAGS="-L$with_sqlite/lib"
-     SQLITE_CPPFLAGS="-I$with_sqlite/include"
-     sqlite=true)
-    LDFLAGS=$SAVE_LDFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-    ])
-  ],
-  [AC_MSG_RESULT([--with-sqlite not specified])
-    AC_CHECK_HEADERS(sqlite3.h, sqlite=true)])
-AM_CONDITIONAL(HAVE_SQLITE, [test x$sqlite = xtrue] && [test $libgnunetsq = 1])
-AC_SUBST(SQLITE_CPPFLAGS)
-AC_SUBST(SQLITE_LDFLAGS)
-
-# check for libtalertwistertesting
-talertwister=0
-AC_MSG_CHECKING([for talertwister])
-AC_ARG_WITH([twister],
-            [AS_HELP_STRING([--with-twister=PFX], [base of libtalertwister])],
-            [AC_MSG_RESULT([given as $with_twister])],
-            [AC_MSG_RESULT([not given])
-             with_twister=yes])
-AS_CASE([$with_twister],
-        [yes], [],
-        [no], [AC_MSG_WARN([no twister-testing will be compiled])],
-        [LDFLAGS="-L$with_twister/lib $LDFLAGS"
-         CPPFLAGS="-I$with_twister/include $CPPFLAGS"])
-
-AC_CHECK_HEADERS([taler/taler_twister_service.h],
- [AC_CHECK_LIB([talertwister], [TALER_TWISTER_connect], talertwister=1)])
-AM_CONDITIONAL(HAVE_TWISTER, test x$talertwister = x1)
-
 # should developer logic be compiled (not-for-production code)?
 AC_MSG_CHECKING(whether to compile developer logic)
 AC_ARG_ENABLE([developer-mode],
@@ -500,13 +451,11 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = 
"xyes"])
 AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [false])
 AM_CONDITIONAL([MHD_HAVE_EPOLL], [false])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
-AM_CONDITIONAL([HAVE_SQLITE], [false])
 AM_CONDITIONAL([HAVE_LIBCURL], [false])
 AM_CONDITIONAL([HAVE_LIBGNURL], [false])
 AM_CONDITIONAL([HAVE_DEVELOPER], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
 AM_CONDITIONAL([ENABLE_DOC], [true])
-AM_CONDITIONAL([HAVE_TWISTER], [false])
 
 # end of 'doc_only'
 ])
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 582dba3..768bcb3 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -263,8 +263,6 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SQLITE_CPPFLAGS = @SQLITE_CPPFLAGS@
-SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
 STRIP = @STRIP@
 TALER_LIB_LDFLAGS = @TALER_LIB_LDFLAGS@
 TALER_PLUGIN_LDFLAGS = @TALER_PLUGIN_LDFLAGS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c9def4..637e42f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,9 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if HAVE_POSTGRESQL
   PQ_DIR = pq
 endif
-if HAVE_SQLITE
-  SQ_DIR = sq
-endif
 
 pkgcfgdir = $(prefix)/share/taler/config.d/
 pkgcfg_DATA = \
@@ -14,36 +11,12 @@ pkgcfg_DATA = \
 EXTRA_DIST = \
   taler.conf
 
-# SUBDIRS = \
-  include \
-  util \
-  json \
-  extensions \
-  curl \
-  $(PQ_DIR) \
-  $(SQ_DIR) \
-  mhd \
-  templating \
-  bank-lib \
-  donaudb \
-  kyclogic \
-  donau \
-  auditordb \
-  auditor \
-  lib \
-  donau-tools \
-  extensions/age_restriction \
-  testing \
-  benchmark
-
-
 SUBDIRS = \
   include \
   util \
   json \
   curl \
   $(PQ_DIR) \
-  $(SQ_DIR) \
   mhd \
   donaudb \
   donau \
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index d44ca03..caf31bd 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -21,21 +21,6 @@ bin_SCRIPTS = \
 lib_LTLIBRARIES = \
   libtalertesting.la
 
-if HAVE_TWISTER
-lib_LTLIBRARIES += libtalertwistertesting.la
-libtalertwistertesting_la_SOURCES = \
-  testing_api_twister_helpers.c \
-  testing_api_cmd_twister_exec_client.c
-libtalertwistertesting_la_LIBADD = \
-  -lgnunetutil \
-  libtalertesting.la \
-  -ltalertwister \
-  $(XLIB)
-libtalertwistertesting_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
-endif
-
 libtalertesting_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
@@ -171,11 +156,6 @@ check_PROGRAMS = \
   test_taler_donau_wirewatch-postgres \
   test_donau_p2p_cs \
   test_donau_p2p_rsa
-if HAVE_TWISTER
-  check_PROGRAMS += \
-    test_donau_api_twisted_cs \
-    test_donau_api_twisted_rsa \
-    test_bank_api_with_fakebank_twisted
 endif
 
 
@@ -482,55 +462,6 @@ test_taler_donau_wirewatch_postgres_LDADD = \
   -lpthread \
   $(XLIB)
 
-test_donau_api_twisted_cs_SOURCES = \
-  test_donau_api_twisted.c
-test_donau_api_twisted_cs_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  libtalertesting.la \
-  libtalertwistertesting.la \
-  $(top_builddir)/src/lib/libtalerdonau.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
-test_donau_api_twisted_rsa_SOURCES = \
-  test_donau_api_twisted.c
-test_donau_api_twisted_rsa_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  libtalertesting.la \
-  libtalertwistertesting.la \
-  $(top_builddir)/src/lib/libtalerdonau.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
-test_bank_api_with_fakebank_twisted_SOURCES = \
-  test_bank_api_twisted.c
-test_bank_api_with_fakebank_twisted_LDADD = \
-  libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/lib/libtalerdonau.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  libtalertwistertesting.la \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
 test_kyc_api_SOURCES = \
   test_kyc_api.c
 test_kyc_api_LDADD = \
@@ -559,7 +490,6 @@ EXTRA_DIST = \
   test_auditor_api_expire_reserve_now-rsa.conf \
   test_bank_api.conf \
   test_bank_api_fakebank.conf \
-  test_bank_api_fakebank_twisted.conf \
   test_bank_api_nexus.conf \
   test_donau_api_home/.config/taler/account-2.json \
   test_donau_api_home/.local/share/taler/donau-offline/master.priv \
@@ -573,9 +503,6 @@ EXTRA_DIST = \
   test_donau_api_age_restiction.conf \
   test_donau_api_age_restiction-cs.conf \
   test_donau_api_age_restiction-rsa.conf \
-  test_donau_api_twisted.conf \
-  test_donau_api_twisted-cs.conf \
-  test_donau_api_twisted-rsa.conf \
   test_donau_api_keys_cherry_picking.conf \
   test_donau_api_keys_cherry_picking-cs.conf \
   test_donau_api_keys_cherry_picking-rsa.conf \
diff --git a/taler_config.h.in b/taler_config.h.in
index f7300ad..de59a8c 100644
--- a/taler_config.h.in
+++ b/taler_config.h.in
@@ -87,9 +87,6 @@
 /* Define to 1 if Postgres is available */
 #undef HAVE_POSTGRESQL
 
-/* Define to 1 if you have the <sqlite3.h> header file. */
-#undef HAVE_SQLITE3_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -120,9 +117,6 @@
 /* Define to 1 if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 
-/* Define to 1 if you have the <taler/taler_twister_service.h> header file. */
-#undef HAVE_TALER_TALER_TWISTER_SERVICE_H
-
 /* Define to 1 if the system has the type `uintmax_t'. */
 #undef HAVE_UINTMAX_T
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.