aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-07-31 11:47:33 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-07-31 11:47:33 +0200
commitdb229c864059d57719571b447e4a040374bf8264 (patch)
tree4957c4aeb2aefd1ce75a9004d7857c2dec748f29
parent71022180e5cb1aa1ce4399c7b852cf248045daa2 (diff)
downloadmerchant-db229c864059d57719571b447e4a040374bf8264.tar.gz
merchant-db229c864059d57719571b447e4a040374bf8264.tar.bz2
merchant-db229c864059d57719571b447e4a040374bf8264.zip
tuning the conf file to suite new taler libraries names
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac10
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index ea5a667e..9e79cc8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+# the following definition tells where others .am are located
AM_CPPFLAGS = -I$(top_srcdir)/src/include
SUBDIRS = src doc
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index ed82e0e4..d8c7714d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,12 @@ AS_CASE([$with_mint],
[no], [AC_MSG_ERROR([--with-mint is required])],
[LDFLAGS="-L$with_mint/lib $LDFLAGS"
CPPFLAGS="-I$with_mint/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
-AC_CHECK_HEADERS([taler/db_pq.h],
- [AC_CHECK_LIB([talerpq], [TALER_DB_exec_prepared], libtalerpq=1)],
+
+CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
+AC_CHECK_HEADERS([taler/taler_pq_lib.h],
+ [AC_CHECK_LIB([talerpq], [TALER_PQ_exec_prepared], libtalerpq=1)],
[], [#ifdef HAVE_GNUNET_PLATFORM_H
#include <gnunet/platform.h>
#endif])
@@ -173,7 +177,7 @@ AC_TYPE_UINTMAX_T
# Checks for library functions.
AC_CHECK_FUNCS([strdup])
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([#Makefile
doc/Makefile
src/Makefile
src/include/Makefile