aboutsummaryrefslogtreecommitdiff
path: root/src/datastore
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2014-08-08 22:20:48 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2014-08-08 22:20:48 +0000
commitf831fabcad550115c2e83260cdf0894773692502 (patch)
tree561ce7a4309a36383a35ac0ac6bc504079a2ac99 /src/datastore
parentb67016043fe41bfe3832384a1fb7503ef2220364 (diff)
Include libpq-fe.h instead of postgres/libpq-fe.h.
Also add a macro for checking libpq from Autoconf macro archives.
Diffstat (limited to 'src/datastore')
-rw-r--r--src/datastore/Makefile.am6
-rw-r--r--src/datastore/plugin_datastore_postgres.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 7044cb46af..dc06790aed 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -85,7 +85,7 @@ endif
$(SQLITE_BENCHMARKS)
endif
endif
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
if HAVE_TESTING
if HAVE_BENCHMARKS
@@ -146,9 +146,9 @@ libgnunet_plugin_datastore_postgres_la_LIBADD = \
$(top_builddir)/src/postgres/libgnunetpostgres.la \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq
libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
+ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
- $(POSTGRES_CPPFLAGS) $(AM_CPPFLAGS)
+ $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
libgnunet_plugin_datastore_template_la_SOURCES = \
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 54e5df375a..e9495d35e3 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -27,7 +27,6 @@
#include "platform.h"
#include "gnunet_datastore_plugin.h"
#include "gnunet_postgres_lib.h"
-#include <postgresql/libpq-fe.h>
/**