Include libpq-fe.h instead of postgres/libpq-fe.h.

Also add a macro for checking libpq from Autoconf macro archives.

9 files changed, 13 insertions, 15 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 902c3290b..18f8aeef2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
  POSTGRES_DIR = postgres
 endif
 
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 7a89da852..941072396 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 150a9d5dc..9e6774142 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__)
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 7044cb46a..dc06790ae 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 54e5df375..e9495d35e 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>
 
 
 /**
diff --git a/src/include/gnunet_postgres_lib.h b/src/include/gnunet_postgres_lib.h
index e2fc6b0e5..498d9857c 100644
--- a/src/include/gnunet_postgres_lib.h
+++ b/src/include/gnunet_postgres_lib.h
@@ -26,7 +26,7 @@
 #define GNUNET_POSTGRES_LIB_H
 
 #include "gnunet_util_lib.h"
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 921274593..eee9885d0 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -26,7 +26,7 @@ SQLITE_TESTS = test_plugin_namecache_sqlite
 endif
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
 POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la
 if HAVE_TESTING
 POSTGRES_TESTS = test_plugin_namecache_postgres
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 17bd534c7..90e95f41c 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -26,7 +26,7 @@ SQLITE_TESTS = test_plugin_namestore_sqlite
 endif
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
 # postgres doesn't even build yet; thus: experimental!
 POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
 if HAVE_TESTING
diff --git a/src/postgres/Makefile.am b/src/postgres/Makefile.am
index a9a7cdfae..d005866b2 100644
--- a/src/postgres/Makefile.am
+++ b/src/postgres/Makefile.am
@@ -8,7 +8,7 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
 lib_LTLIBRARIES = libgnunetpostgres.la
 endif