diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2014-08-08 22:20:48 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2014-08-08 22:20:48 +0000 |
commit | f831fabcad550115c2e83260cdf0894773692502 (patch) | |
tree | 561ce7a4309a36383a35ac0ac6bc504079a2ac99 /src/datastore | |
parent | b67016043fe41bfe3832384a1fb7503ef2220364 (diff) | |
download | gnunet-f831fabcad550115c2e83260cdf0894773692502.tar.gz gnunet-f831fabcad550115c2e83260cdf0894773692502.zip |
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.am | 6 | ||||
-rw-r--r-- | src/datastore/plugin_datastore_postgres.c | 1 |
2 files changed, 3 insertions, 4 deletions
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 | |||
85 | $(SQLITE_BENCHMARKS) | 85 | $(SQLITE_BENCHMARKS) |
86 | endif | 86 | endif |
87 | endif | 87 | endif |
88 | if HAVE_POSTGRES | 88 | if HAVE_POSTGRESQL |
89 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la | 89 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la |
90 | if HAVE_TESTING | 90 | if HAVE_TESTING |
91 | if HAVE_BENCHMARKS | 91 | if HAVE_BENCHMARKS |
@@ -146,9 +146,9 @@ libgnunet_plugin_datastore_postgres_la_LIBADD = \ | |||
146 | $(top_builddir)/src/postgres/libgnunetpostgres.la \ | 146 | $(top_builddir)/src/postgres/libgnunetpostgres.la \ |
147 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq | 147 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq |
148 | libgnunet_plugin_datastore_postgres_la_LDFLAGS = \ | 148 | libgnunet_plugin_datastore_postgres_la_LDFLAGS = \ |
149 | $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq | 149 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) |
150 | libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \ | 150 | libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \ |
151 | $(POSTGRES_CPPFLAGS) $(AM_CPPFLAGS) | 151 | $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS) |
152 | 152 | ||
153 | 153 | ||
154 | libgnunet_plugin_datastore_template_la_SOURCES = \ | 154 | 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 @@ | |||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_datastore_plugin.h" | 28 | #include "gnunet_datastore_plugin.h" |
29 | #include "gnunet_postgres_lib.h" | 29 | #include "gnunet_postgres_lib.h" |
30 | #include <postgresql/libpq-fe.h> | ||
31 | 30 | ||
32 | 31 | ||
33 | /** | 32 | /** |