summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-05-04 10:21:35 +0200
committerChristian Grothoff <christian@grothoff.org>2016-05-04 10:21:35 +0200
commit458992dc6fa0152dc55d68f3f633c58a05877407 (patch)
treeb8ff11fb8e38c98f8c9ffc800f2a3ab69186d7c9
parentc1575167f7d813e01fffb26b2b7df9cb22ecbcbc (diff)
downloadexchange-458992dc6fa0152dc55d68f3f633c58a05877407.tar.gz
exchange-458992dc6fa0152dc55d68f3f633c58a05877407.tar.bz2
exchange-458992dc6fa0152dc55d68f3f633c58a05877407.zip
fixes for disting
-rw-r--r--.gitignore1
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac29
-rw-r--r--src/Makefile.am3
-rw-r--r--src/bank-lib/Makefile.am2
-rw-r--r--src/exchange-tools/Makefile.am4
-rw-r--r--src/exchange/Makefile.am3
-rw-r--r--src/util/Makefile.am4
8 files changed, 43 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 1c3cba8f..9dac85a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ src/util/test_amount
src/util/test_crypto
src/util/test_json
src/util/test_wireformats
+src/util/taler-arm
doc/paper/llncs.cls
doc/paper/taler.bbl
doc/paper/taler.blg
diff --git a/ChangeLog b/ChangeLog
index e69de29b..98e96900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+Wed May 4 10:19:36 CEST 2016
+ Releasing taler-exchange 0.0. -CG
diff --git a/configure.ac b/configure.ac
index 092b0ce5..939e8f7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,35 @@ AS_IF([test $libgnunetcurl != 1],
*** ]])])
+
+# Check for GNUnet's libgnunetpq.
+libgnunetpq=0
+AC_MSG_CHECKING([for libgnunetpq])
+AC_ARG_WITH(gnunet,
+ [AS_HELP_STRING([--with-gnunet=PFX], [base of GNUnet installation])],
+ [AC_MSG_RESULT([given as $with_gnunet])],
+ [AC_MSG_RESULT(not given)
+ with_gnunet=yes])
+AS_CASE([$with_gnunet],
+ [yes], [],
+ [no], [AC_MSG_ERROR([--with-gnunet is required])],
+ [LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
+ CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"])
+AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_pq_lib.h],
+ [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_result_spec_string], libgnunetpq=1)],
+ [], [#ifdef HAVE_GNUNET_PLATFORM_H
+ #include <gnunet/platform.h>
+ #endif])
+AS_IF([test $libgnunetpq != 1],
+ [AC_MSG_ERROR([[
+***
+*** You need libgnunetpq to build this program.
+*** Make sure you have Postgres installed while
+*** building GNUnet (and that your GNUnet version
+*** is recent!)
+*** ]])])
+
+
# check for libmicrohttpd
microhttpd=0
AC_MSG_CHECKING([for microhttpd])
diff --git a/src/Makefile.am b/src/Makefile.am
index ee66bb39..74956a6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,9 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \
taler.conf
+EXTRA_DIST = \
+ taler.conf
+
SUBDIRS = include util json $(PQ_DIR) $(BANK_LIB) wire exchangedb exchange exchange-tools
if HAVE_LIBCURL
SUBDIRS += exchange-lib
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index f7f5dd73..7e4dd51f 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -28,7 +28,7 @@ libtalerbank_la_LIBADD = \
$(XLIB)
libfakebank_la_SOURCES = \
- fakebank.c
+ fakebank.c fakebank.h
libfakebank_la_LIBADD = \
$(top_builddir)/src/json/libtalerjson.la \
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 631f3af2..a1e4f67a 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -8,7 +8,6 @@ pkgcfg_DATA = \
exchange-signkeys.conf \
coins.conf
-
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
@@ -93,4 +92,5 @@ taler_exchange_dbinit_CPPFLAGS = \
EXTRA_DIST = \
- auditor.conf
+ auditor.conf \
+ $(pkgcfg_DATA)
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index 3dba0bb7..314bf8ba 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -94,4 +94,5 @@ EXTRA_DIST = \
test-taler-exchange-aggregator-postgres.conf \
test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv \
test_taler_exchange_httpd.conf \
- exchange.conf
+ exchange.conf \
+ $(check_SCRIPTS)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 61a8a766..c0713df8 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -14,7 +14,9 @@ pkgcfg_DATA = \
paths.conf
EXTRA_DIST = \
- paths.conf
+ paths.conf \
+ taler-config.in \
+ taler-arm.in
templated_scripts = taler-config taler-arm
dist_bin_SCRIPTS = $(templated_scripts)