From 016c4a5cf2cdbcc0ee7b2de4bedadeb1d9ed9259 Mon Sep 17 00:00:00 2001 From: Jonathan Buchanan Date: Wed, 22 Jul 2020 01:37:39 -0400 Subject: [PATCH] update gana, add error codes c file --- bootstrap | 3 +++ contrib/gana | 2 +- src/util/Makefile.am | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index a0bbd3b72..3c42d2779 100755 --- a/bootstrap +++ b/bootstrap @@ -15,6 +15,9 @@ cd contrib/gana/gnu-taler-error-codes make cd ../../.. cp contrib/gana/gnu-taler-error-codes/taler-error-codes.h src/include/taler_error_codes.h +cp contrib/gana/gnu-taler-error-codes/taler-error-codes.c src/util/taler_error_codes.c +# Change the include in the source file so it can find the header +sed -i '' 's/taler\-error\-codes\.h/taler_error_codes.h/g' src/util/taler_error_codes.c # This is more portable than `which' but comes with # the caveat of not(?) properly working on busybox's ash: diff --git a/contrib/gana b/contrib/gana index 05d427aaf..007b2a19f 160000 --- a/contrib/gana +++ b/contrib/gana @@ -1 +1 @@ -Subproject commit 05d427aafa7f9e637db969e4933905be2a8d9b9c +Subproject commit 007b2a19f8d9bdf926aa584d85beb5bdac32bf9d diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 5ff3b898f..3831dd3fb 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -40,6 +40,7 @@ libtalerutil_la_SOURCES = \ getopt.c \ mhd.c \ payto.c \ + taler_error_codes.c \ url.c \ util.c \ yna.c \