-fix ftbfs issues

6 files changed, 49 insertions, 43 deletions

diff --git a/src/Makefile b/src/Makefile
index e8165ad1..cd0ee0d2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -172,19 +172,19 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-ACLOCAL = ${SHELL} /home/grothoff/research/merchant/missing aclocal-1.14
+ACLOCAL = ${SHELL} /home/grothoff/research/taler-merchant/missing aclocal-1.14
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = ar
-AUTOCONF = ${SHELL} /home/grothoff/research/merchant/missing autoconf
-AUTOHEADER = ${SHELL} /home/grothoff/research/merchant/missing autoheader
-AUTOMAKE = ${SHELL} /home/grothoff/research/merchant/missing automake-1.14
+AUTOCONF = ${SHELL} /home/grothoff/research/taler-merchant/missing autoconf
+AUTOHEADER = ${SHELL} /home/grothoff/research/taler-merchant/missing autoheader
+AUTOMAKE = ${SHELL} /home/grothoff/research/taler-merchant/missing automake-1.14
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -Wall -g -O0 -Wall
 CPP = gcc -E
-CPPFLAGS = -I/home/grothoff//include 
+CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include  -I/usr/include/postgresql
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -204,7 +204,7 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/home/grothoff//lib 
+LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib 
 LIBGCRYPT_CFLAGS = 
 LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
 LIBGCRYPT_LIBS = -lgcrypt
@@ -216,7 +216,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/grothoff/research/merchant/missing makeinfo
+MAKEINFO = ${SHELL} /home/grothoff/research/taler-merchant/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
@@ -244,10 +244,10 @@ SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.0.0
 _libgnurl_config = 
-abs_builddir = /home/grothoff/research/merchant/src
-abs_srcdir = /home/grothoff/research/merchant/src
-abs_top_builddir = /home/grothoff/research/merchant
-abs_top_srcdir = /home/grothoff/research/merchant
+abs_builddir = /home/grothoff/research/taler-merchant/src
+abs_srcdir = /home/grothoff/research/taler-merchant/src
+abs_top_builddir = /home/grothoff/research/taler-merchant
+abs_top_srcdir = /home/grothoff/research/taler-merchant
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
@@ -276,7 +276,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/grothoff/research/merchant/install-sh
+install_sh = ${SHELL} /home/grothoff/research/taler-merchant/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/src/include/Makefile b/src/include/Makefile
index 5bd27d29..f612d3e5 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -112,19 +112,19 @@ am__can_run_installinfo = \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/grothoff/research/merchant/missing aclocal-1.14
+ACLOCAL = ${SHELL} /home/grothoff/research/taler-merchant/missing aclocal-1.14
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = ar
-AUTOCONF = ${SHELL} /home/grothoff/research/merchant/missing autoconf
-AUTOHEADER = ${SHELL} /home/grothoff/research/merchant/missing autoheader
-AUTOMAKE = ${SHELL} /home/grothoff/research/merchant/missing automake-1.14
+AUTOCONF = ${SHELL} /home/grothoff/research/taler-merchant/missing autoconf
+AUTOHEADER = ${SHELL} /home/grothoff/research/taler-merchant/missing autoheader
+AUTOMAKE = ${SHELL} /home/grothoff/research/taler-merchant/missing automake-1.14
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -Wall -g -O0 -Wall
 CPP = gcc -E
-CPPFLAGS = -I/home/grothoff//include 
+CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include  -I/usr/include/postgresql
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -144,7 +144,7 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/home/grothoff//lib 
+LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib 
 LIBGCRYPT_CFLAGS = 
 LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
 LIBGCRYPT_LIBS = -lgcrypt
@@ -156,7 +156,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/grothoff/research/merchant/missing makeinfo
+MAKEINFO = ${SHELL} /home/grothoff/research/taler-merchant/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
@@ -184,10 +184,10 @@ SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.0.0
 _libgnurl_config = 
-abs_builddir = /home/grothoff/research/merchant/src/include
-abs_srcdir = /home/grothoff/research/merchant/src/include
-abs_top_builddir = /home/grothoff/research/merchant
-abs_top_srcdir = /home/grothoff/research/merchant
+abs_builddir = /home/grothoff/research/taler-merchant/src/include
+abs_srcdir = /home/grothoff/research/taler-merchant/src/include
+abs_top_builddir = /home/grothoff/research/taler-merchant
+abs_top_srcdir = /home/grothoff/research/taler-merchant
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
@@ -216,7 +216,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/grothoff/research/merchant/install-sh
+install_sh = ${SHELL} /home/grothoff/research/taler-merchant/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/src/merchant/Makefile b/src/merchant/Makefile
index bbc16e7b..c3be128d 100644
--- a/src/merchant/Makefile
+++ b/src/merchant/Makefile
@@ -191,19 +191,19 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/grothoff/research/merchant/missing aclocal-1.14
+ACLOCAL = ${SHELL} /home/grothoff/research/taler-merchant/missing aclocal-1.14
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = ar
-AUTOCONF = ${SHELL} /home/grothoff/research/merchant/missing autoconf
-AUTOHEADER = ${SHELL} /home/grothoff/research/merchant/missing autoheader
-AUTOMAKE = ${SHELL} /home/grothoff/research/merchant/missing automake-1.14
+AUTOCONF = ${SHELL} /home/grothoff/research/taler-merchant/missing autoconf
+AUTOHEADER = ${SHELL} /home/grothoff/research/taler-merchant/missing autoheader
+AUTOMAKE = ${SHELL} /home/grothoff/research/taler-merchant/missing automake-1.14
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -Wall -g -O0 -Wall
 CPP = gcc -E
-CPPFLAGS = -I/home/grothoff//include 
+CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include  -I/usr/include/postgresql
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -223,7 +223,7 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/home/grothoff//lib 
+LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib 
 LIBGCRYPT_CFLAGS = 
 LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
 LIBGCRYPT_LIBS = -lgcrypt
@@ -235,7 +235,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/grothoff/research/merchant/missing makeinfo
+MAKEINFO = ${SHELL} /home/grothoff/research/taler-merchant/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
@@ -263,10 +263,10 @@ SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.0.0
 _libgnurl_config = 
-abs_builddir = /home/grothoff/research/merchant/src/merchant
-abs_srcdir = /home/grothoff/research/merchant/src/merchant
-abs_top_builddir = /home/grothoff/research/merchant
-abs_top_srcdir = /home/grothoff/research/merchant
+abs_builddir = /home/grothoff/research/taler-merchant/src/merchant
+abs_srcdir = /home/grothoff/research/taler-merchant/src/merchant
+abs_top_builddir = /home/grothoff/research/taler-merchant
+abs_top_srcdir = /home/grothoff/research/taler-merchant
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
@@ -295,7 +295,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/grothoff/research/merchant/install-sh
+install_sh = ${SHELL} /home/grothoff/research/taler-merchant/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -325,6 +325,7 @@ taler_merchant_dbinit_LDADD = \
   -lpq \
   -lgnunetutil \
   -ltalerutil \
+  -ltalerpq \
   -lgnunetpostgres
 
 taler_merchant_dbinit_LDFLAGS = \
@@ -360,6 +361,7 @@ taler_merchant_serve_LDADD = \
   -lmicrohttpd \
   -ltalermintapi \
   -ltalerutil \
+  -ltalerpq \
   -ljansson
 
 taler_merchant_serve_LDFLAGS = \
diff --git a/src/merchant/Makefile.am b/src/merchant/Makefile.am
index 701b3ee8..b1419f1a 100644
--- a/src/merchant/Makefile.am
+++ b/src/merchant/Makefile.am
@@ -12,6 +12,7 @@ taler_merchant_dbinit_LDADD = \
   -lpq \
   -lgnunetutil \
   -ltalerutil \
+  -ltalerpq \
   -lgnunetpostgres
 taler_merchant_dbinit_LDFLAGS = \
   $(POSTGRESQL_LDFLAGS)
@@ -47,6 +48,7 @@ taler_merchant_serve_LDADD = \
   -lmicrohttpd \
   -ltalermintapi \
   -ltalerutil \
+  -ltalerpq \
   -ljansson
 taler_merchant_serve_LDFLAGS = \
   $(POSTGRESQL_LDFLAGS)
diff --git a/src/merchant/Makefile.in b/src/merchant/Makefile.in
index 33fcb832..9e261258 100644
--- a/src/merchant/Makefile.in
+++ b/src/merchant/Makefile.in
@@ -325,6 +325,7 @@ taler_merchant_dbinit_LDADD = \
   -lpq \
   -lgnunetutil \
   -ltalerutil \
+  -ltalerpq \
   -lgnunetpostgres
 
 taler_merchant_dbinit_LDFLAGS = \
@@ -360,6 +361,7 @@ taler_merchant_serve_LDADD = \
   -lmicrohttpd \
   -ltalermintapi \
   -ltalerutil \
+  -ltalerpq \
   -ljansson
 
 taler_merchant_serve_LDFLAGS = \
diff --git a/src/merchant/taler_merchant_serve.c b/src/merchant/taler_merchant_serve.c
index 67738886..b025052c 100644
--- a/src/merchant/taler_merchant_serve.c
+++ b/src/merchant/taler_merchant_serve.c
@@ -454,16 +454,16 @@ process_post_json (struct MHD_Connection *connection,
 static struct GNUNET_HashCode
 hash_wireformat (uint64_t nounce)
 {
-  struct TALER_HashContext hc;
+  struct GNUNET_HashContext *hc;
   struct GNUNET_HashCode hash;
 
-  TALER_hash_context_start (&hc);
-  TALER_hash_context_read (&hc, wire->iban, strlen (wire->iban));
-  TALER_hash_context_read (&hc, wire->name, strlen (wire->name));
-  TALER_hash_context_read (&hc, wire->bic, strlen (wire->bic));
+  hc = GNUNET_CRYPTO_hash_context_start ();
+  GNUNET_CRYPTO_hash_context_read (hc, wire->iban, strlen (wire->iban));
+  GNUNET_CRYPTO_hash_context_read (hc, wire->name, strlen (wire->name));
+  GNUNET_CRYPTO_hash_context_read (hc, wire->bic, strlen (wire->bic));
   nounce = GNUNET_htonll (nounce);
-  TALER_hash_context_read (&hc, &nounce, sizeof (nounce));
-  TALER_hash_context_finish (&hc, &hash);
+  GNUNET_CRYPTO_hash_context_read (hc, &nounce, sizeof (nounce));
+  GNUNET_CRYPTO_hash_context_finish (hc, &hash);
   return hash;
 }