[GNUnet-SVN] [taler-merchant] branch master updated (479bfd4 -> ee11673)

[gnunet]

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

dold pushed a change to branch master
in repository merchant.

    from 479bfd4  rounding /history date parameter
     new ca8f664  don't track version.texi, it's auto-generated
     new a57f3f0  gitignore
     new 20fa0cd  check for specific jansson version using pkgconfig
     new ee11673  use order_id as summary if contract doesn't have it

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                 |  1 +
 configure.ac                               | 23 +++++------------------
 doc/version.texi                           |  4 ----
 src/backend/taler-merchant-httpd_history.c |  8 ++++++--
 4 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 doc/version.texi

diff --git a/.gitignore b/.gitignore
index 06e6ce0..cfc6da4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ taler_merchant_config.h
 taler_merchant_config.h.in
 doc/*
 !doc/*.texi
+doc/version.texi
 !doc/*.am
 !doc/*.sh
 !doc/examples/
diff --git a/configure.ac b/configure.ac
index 11afa00..f3f7b23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,27 +152,14 @@ AS_IF([test $microhttpd = 0],
 *** You need libmicrohttpd to build this program.
 *** ]])])
 
-
-# check for libjansson (Jansson JSON library)
 jansson=0
-AC_MSG_CHECKING([for jansson])
-AC_ARG_WITH([jansson],
-            [AS_HELP_STRING([--with-jansson=PFX], [base of jansson 
installation])],
-            [AC_MSG_RESULT([given as $with_jansson])],
-            [AC_MSG_RESULT([not given])
-             with_jansson=yes])
-AS_CASE([$with_jansson],
-        [yes], [],
-        [no], [AC_MSG_ERROR([--with-jansson is required])],
-        [LDFLAGS="-L$with_jansson/lib $LDFLAGS"
-         CPPFLAGS="-I$with_jansson/include $CPPFLAGS"])
-AC_CHECK_LIB(jansson,json_pack,
-  [AC_CHECK_HEADER([jansson.h],[jansson=1])])
-AS_IF([test $jansson = 0],
-  [AC_MSG_ERROR([[
+PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3], 
+                  [LDFLAGS="$JANSSON_LIBS $LDFLAGS"
+                   CPPFLAGS="$JANSSON_CFLAGS $CPPFLAGS"],
+                  [AC_MSG_ERROR([[
 ***
 *** You need libjansson to build this program.
-*** ]])])
+***]])])
 
 # check for libgnurl
 # libgnurl
diff --git a/doc/version.texi b/doc/version.texi
deleted file mode 100644
index fc2400a..0000000
--- a/doc/version.texi
+++ /dev/null
@@ -1,4 +0,0 @@
address@hidden UPDATED 7 June 2017
address@hidden UPDATED-MONTH June 2017
address@hidden EDITION 0.3.0
address@hidden VERSION 0.3.0
diff --git a/src/backend/taler-merchant-httpd_history.c 
b/src/backend/taler-merchant-httpd_history.c
index 9d6459e..eeec11b 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -45,19 +45,23 @@ pd_cb (void *cls,
   json_t *amount;
   json_t *timestamp;
   json_t *instance;
-  json_t *summary;
+  json_t *summary=NULL;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "/history's row_id: %llu\n",
               (unsigned long long) row_id);
 
   GNUNET_assert (-1 != json_unpack ((json_t *) contract_terms,
-                                    "{s:o, s:o, s:{s:o}, s:o}",
+                                    "{s:o, s:o, s:{s:o}, s?:o}",
                                     "amount", &amount,
                                     "timestamp", &timestamp,
                                     "merchant", "instance", &instance,
                                     "summary", &summary));
 
+  if (NULL == summary) {
+    summary = json_string (order_id);
+  }
+
   GNUNET_break (NULL != (entry = json_pack ("{s:I, s:s, s:O, s:O, s:O, s:O}",
                                             "row_id", row_id,
                                             "order_id", order_id,

-- 
To stop receiving notification emails like this one, please contact
address@hidden