From f831fabcad550115c2e83260cdf0894773692502 Mon Sep 17 00:00:00 2001
From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Fri, 8 Aug 2014 22:20:48 +0000
Subject: Include libpq-fe.h instead of postgres/libpq-fe.h.

Also add a macro for checking libpq from Autoconf macro archives.
---
 src/datacache/Makefile.am                 | 10 +++++-----
 src/datacache/plugin_datacache_postgres.c |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/datacache')

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 7a89da8528..941072396a 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -19,7 +19,7 @@ endif
 if HAVE_SQLITE
   SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
 endif
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
   POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
 endif
 
@@ -68,11 +68,11 @@ libgnunet_plugin_datacache_postgres_la_LIBADD = \
   $(top_builddir)/src/postgres/libgnunetpostgres.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
+  $(GN_PLUGIN_LDFLAGS) -lpq
 libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
- $(POSTGRES_CPPFLAGS) $(AM_CPPFLAGS)
+ $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
 libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
+ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
 libgnunet_plugin_datacache_template_la_SOURCES = \
   plugin_datacache_template.c
@@ -104,7 +104,7 @@ HEAP_TESTS = \
  test_datacache_quota_heap \
  $(HEAP_BENCHMARKS)
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
 if HAVE_BENCHMARKS
  POSTGRES_BENCHMARKS = \
   perf_datacache_postgres
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index 150a9d5dc0..9e6774142a 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -27,7 +27,6 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_postgres_lib.h"
 #include "gnunet_datacache_plugin.h"
-#include <postgresql/libpq-fe.h>
 
 #define LOG(kind,...) GNUNET_log_from (kind, "datacache-postgres", __VA_ARGS__)
 
-- 
cgit v1.2.3-18-g5258