[taler-anastasis] branch master updated: fix misc build issues

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 406729a  fix misc build issues
406729a is described below

commit 406729a7f9719dd1cddaf6bd26a12b21837c09d9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Apr 4 22:07:55 2021 +0200

    fix misc build issues
---
 README                                             |  10 +-
 configure.ac                                       | 197 +++++++++++----------
 ...intan-overrides => anastasis.lintian-overrides} |   0
 src/stasis/Makefile.am                             |   2 -
 4 files changed, 111 insertions(+), 98 deletions(-)

diff --git a/README b/README
index 0302e6d..823c8f4 100644
--- a/README
+++ b/README
@@ -2,14 +2,18 @@
 ANASTASIS
 =========
 
-DESCRIPTION
+This package includes the Anastasis core logic.  The code is
+released under the GNU General Public License (v3 or later).
+See COPYING for details.
+
+Description
 ===========
 
 Anastasis is a key backup and recovery tool.  This package
 includes the backend run by the Anastasis providers as
 well as libraries for clients and a command-line interface.
 
-DEPENDENCIES
+Dependencies
 ============
 
 libjansson  : MIT License
@@ -20,7 +24,7 @@ libtaler*   : GPLv3+
 GNU recutils: GPLv3+ (when building from Git)
 
 
-DIRECTORY STRUCTURE
+Directory structure
 ===================
 
 src/include/ includes installed (public) headers
diff --git a/configure.ac b/configure.ac
index f8d2cdb..fc90cc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,65 @@ AC_SUBST(TALER_LIB_LDFLAGS)
 AC_SUBST(TALER_PLUGIN_LDFLAGS)
 
 
+# check for libgnurl
+# libgnurl
+LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
+AS_IF([test "x$gnurl" = x1],[
+       AM_CONDITIONAL(HAVE_LIBGNURL, true)
+       AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
+],[
+       AM_CONDITIONAL(HAVE_LIBGNURL, false)
+])
+
+# libcurl-gnutls
+LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
+AS_IF([test "x$curl" = xtrue],
+      [LDFLAGS="-L$with_libcurl/lib $LDFLAGS"
+       CPPFLAGS="-I$with_libcurl/include $CPPFLAGS"
+       AC_CHECK_HEADERS([curl/curl.h],
+                        [AC_CHECK_DECLS(CURLINFO_TLS_SESSION,
+                         [curl=true],
+                         [curl=false],
+                         [[#include <curl/curl.h>]])],
+                        [curl=false])
+       # need libcurl-gnutls.so, everything else is not acceptable
+       AC_CHECK_LIB([curl-gnutls],
+                    [curl_easy_getinfo],,
+                    [curl=false])])
+       # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
+
+# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
+# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
+# *either* header set).
+AC_CHECK_HEADERS([curl/curl.h],,
+  curl=false
+  AC_CHECK_HEADERS([gnurl/curl.h],,
+  gnurl=false))
+
+# libgnurl
+AS_IF([test "x$gnurl" = "x0"],
+      [AS_IF([test "x$curl" = "x0"],
+              [AC_MSG_NOTICE([NOTICE: libgnurl not found. taler-bank support 
will not be compiled.])],
+              [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use 
libcurl-gnutls instead.])])])
+
+AS_IF([test x$curl = xfalse],
+       [AM_CONDITIONAL(HAVE_LIBCURL, false)
+        AS_IF([test "x$gnurl" = "x0"],
+              [AC_MSG_WARN([GNU Taler requires libcurl-gnutls  >= 7.34])])],
+       [AM_CONDITIONAL(HAVE_LIBCURL, true)
+       AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])])
+
+# gcov compilation
+AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
+AC_ARG_ENABLE([coverage],
+              AS_HELP_STRING([--enable-coverage],
+                             [compile the library with code coverage support]),
+              [use_gcov=${enableval}],
+              [use_gcov=no])
+AC_MSG_RESULT($use_gcov)
+AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
+
+
 # Check for GNUnet's libgnunetutil.
 libgnunetutil=0
 AC_MSG_CHECKING([for libgnunetutil])
@@ -75,10 +134,13 @@ AS_CASE([$with_gnunet],
         [LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
          CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"])
 AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
- [AC_CHECK_LIB([gnunetutil], [GNUNET_SCHEDULER_run], libgnunetutil=1)],
-  [], [#ifdef HAVE_GNUNET_PLATFORM_H
-        #include <gnunet/platform.h>
-       #endif])
+ [AC_CHECK_LIB([gnunetutil],
+               [GNUNET_SCHEDULER_run],
+               [libgnunetutil=1])],
+ [],
+ [#ifdef HAVE_GNUNET_PLATFORM_H
+     #include <gnunet/platform.h>
+  #endif])
 AS_IF([test $libgnunetutil != 1],
   [AC_MSG_ERROR([[
 ***
@@ -93,9 +155,12 @@ AX_LIB_POSTGRESQL([9.3])
 AS_IF([test "x$found_postgresql" = "xyes"],[postgres=true])
 AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
-# Check for Taler's libtalerpq
-libtalerpq=0
-AC_MSG_CHECKING([for libtalerpq])
+
+
+
+# Check for Taler's libtalerutil
+libtalerutil=0
+AC_MSG_CHECKING([for libtalerutil])
 AC_ARG_WITH(exchange,
             [AS_HELP_STRING([--with-exchange=PFX], [base of Taler EXCHANGE 
installation])],
             [AC_MSG_RESULT([given as $with_exchange])],
@@ -110,12 +175,38 @@ AS_CASE([$with_exchange],
 CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
-AC_CHECK_HEADERS([gnunet/gnunet_pq_lib.h],
- [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_connect_with_cfg], libgnunetpq=1)],
-   [], [#ifdef HAVE_GNUNET_PLATFORM_H
-        #include <gnunet/platform.h>
-       #endif])
-AM_CONDITIONAL(HAVE_GNUNETPQ, test x$libgnunetpq = x1)
+AC_CHECK_HEADERS([taler/taler_util.h],
+ [AC_CHECK_LIB([talerutil],
+               [TALER_b2s],
+               [libtalerutil=1],
+               [AC_MSG_ERROR([libtalerutil not found])])],
+ [AC_MSG_ERROR([taler/taler_util.h not found])],
+ [#include <taler/platform.h>])
+
+# Check for Taler's libtalermerchant
+libtalermerchant=0
+AC_MSG_CHECKING([for libtalermerchant])
+AC_ARG_WITH(merchant,
+            [AS_HELP_STRING([--with-merchant=PFX], [base of Taler MERCHANT 
installation])],
+            [AC_MSG_RESULT([given as $with_merchant])],
+            [AC_MSG_RESULT(not given)
+             with_merchant=yes])
+AS_CASE([$with_merchant],
+        [yes], [],
+        [no], [AC_MSG_ERROR([--with-merchant is required])],
+        [LDFLAGS="-L$with_merchant/lib $LDFLAGS"
+         CPPFLAGS="-I$with_merchant/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
+
+AC_CHECK_HEADERS([taler/taler_merchant_service.h],
+ [AC_CHECK_LIB([talermerchant],
+               [TALER_MERCHANT_parse_pay_uri],
+               [libtalermerchant=1],
+               [AC_MSG_ERROR([libtalermerchant not found])])],
+ [AC_MSG_ERROR([taler/taler_merchant_service.h found])],
+ [#include <taler/platform.h>])
+
+
+
 
 # check for libmicrohttpd
 microhttpd=0
@@ -147,84 +238,6 @@ PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3],
 *** You need libjansson to build this program.
 ***]])])
 
-# check for libgnurl
-# libgnurl
-LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
-AS_IF([test "x$gnurl" = x1],[
-       AM_CONDITIONAL(HAVE_LIBGNURL, true)
-       AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
-],[
-       AM_CONDITIONAL(HAVE_LIBGNURL, false)
-])
-
-# libcurl-gnutls
-LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
-AS_IF([test "x$curl" = xtrue],
-      [LDFLAGS="-L$with_libcurl/lib $LDFLAGS"
-       CPPFLAGS="-I$with_libcurl/include $CPPFLAGS"
-       AC_CHECK_HEADERS([curl/curl.h],
-                        [AC_CHECK_DECLS(CURLINFO_TLS_SESSION,
-                         [curl=true],
-                         [curl=false],
-                         [[#include <curl/curl.h>]])],
-                        [curl=false])
-       # need libcurl-gnutls.so, everything else is not acceptable
-       AC_CHECK_LIB([curl-gnutls],
-                    [curl_easy_getinfo],,
-                    [curl=false])])
-       # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
-
-# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
-# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
-# *either* header set).
-AC_CHECK_HEADERS([curl/curl.h],,
-  curl=false
-  AC_CHECK_HEADERS([gnurl/curl.h],,
-  gnurl=false))
-
-# libgnurl
-AS_IF([test "x$gnurl" = "x0"],
-      [AS_IF([test "x$curl" = "x0"],
-              [AC_MSG_NOTICE([NOTICE: libgnurl not found. taler-bank support 
will not be compiled.])],
-              [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use 
libcurl-gnutls instead.])])])
-
-AS_IF([test x$curl = xfalse],
-       [AM_CONDITIONAL(HAVE_LIBCURL, false)
-        AS_IF([test "x$gnurl" = "x0"],
-              [AC_MSG_WARN([GNU Taler requires libcurl-gnutls  >= 7.34])])],
-       [AM_CONDITIONAL(HAVE_LIBCURL, true)
-       AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])])
-
-# check for libtalertwistertesting
-twistertesting=0
-AC_MSG_CHECKING([for talerwtistertesting])
-AC_ARG_WITH([twister],
-            [AS_HELP_STRING([--with-twister=PFX], [base of 
libtalertwistertesting])],
-            [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_testing_lib.h],
- [AC_CHECK_LIB([talertwistertesting], [TALER_TESTING_run_twister], 
twistertesting=1,, [-ltalerexchange -ltalerbank])],
-   [], [#ifdef HAVE_GNUNET_PLATFORM_H
-        #include <gnunet/platform.h>
-       #endif])
-AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1)
-
-# gcov compilation
-AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
-AC_ARG_ENABLE([coverage],
-              AS_HELP_STRING([--enable-coverage],
-                             [compile the library with code coverage support]),
-              [use_gcov=${enableval}],
-              [use_gcov=no])
-AC_MSG_RESULT($use_gcov)
-AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 # Require minimum libgcrypt version
 need_libgcrypt_version=1.6.1
@@ -289,13 +302,11 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = 
"xyes"])
 ],[  # this is about the doc-only if on top of the file
 
 # logic if doc_only is set, make sure conditionals are still defined
-AM_CONDITIONAL([HAVE_GNUNETPQ], [false])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
 AM_CONDITIONAL([HAVE_LIBCURL], [false])
 AM_CONDITIONAL([HAVE_LIBGNURL], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
 AM_CONDITIONAL([ENABLE_DOC], [true])
-AM_CONDITIONAL([HAVE_TWISTER], [true])
 
 
 # end of 'doc_only'
diff --git a/debian/anastasis.lintan-overrides 
b/debian/anastasis.lintian-overrides
similarity index 100%
rename from debian/anastasis.lintan-overrides
rename to debian/anastasis.lintian-overrides
diff --git a/src/stasis/Makefile.am b/src/stasis/Makefile.am
index 83a6306..96f6330 100644
--- a/src/stasis/Makefile.am
+++ b/src/stasis/Makefile.am
@@ -4,11 +4,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 plugindir = $(libdir)/anastasis
 
 if HAVE_POSTGRESQL
-if HAVE_GNUNETPQ
 plugin_LTLIBRARIES = \
   libanastasis_plugin_db_postgres.la
 endif
-endif
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0

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