fixes for disting

This commit is contained in:
Christian Grothoff 2016-05-04 10:21:35 +02:00
parent c1575167f7
commit 458992dc6f
8 changed files with 43 additions and 5 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -0,0 +1,2 @@
Wed May 4 10:19:36 CEST 2016
Releasing taler-exchange 0.0. -CG

View File

@ -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])

View File

@ -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

View File

@ -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 \

View File

@ -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)

View File

@ -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)

View File

@ -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)