From f831fabcad550115c2e83260cdf0894773692502 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura 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. --- configure.ac | 34 +------ m4/ax_lib_postgresql.m4 | 155 ++++++++++++++++++++++++++++++ src/Makefile.am | 2 +- src/datacache/Makefile.am | 10 +- src/datacache/plugin_datacache_postgres.c | 1 - src/datastore/Makefile.am | 6 +- src/datastore/plugin_datastore_postgres.c | 1 - src/include/gnunet_postgres_lib.h | 2 +- src/namecache/Makefile.am | 2 +- src/namestore/Makefile.am | 2 +- src/postgres/Makefile.am | 2 +- 11 files changed, 173 insertions(+), 44 deletions(-) create mode 100644 m4/ax_lib_postgresql.m4 diff --git a/configure.ac b/configure.ac index 6eb0d0375..cefc48243 100644 --- a/configure.ac +++ b/configure.ac @@ -666,35 +666,11 @@ AC_SUBST(SQLITE_LDFLAGS) # test for postgres postgres=false -AC_MSG_CHECKING(for postgres) -AC_ARG_WITH(postgres, - [ --with-postgres=PFX base of postgres installation], - [AC_MSG_RESULT("$with_postgres") - case $with_postgres in - no) - ;; - yes) - AC_CHECK_HEADERS(postgresql/libpq-fe.h, - postgres=true) - ;; - *) - LDFLAGS="-L$with_postgres/lib $LDFLAGS" - CPPFLAGS="-I$with_postgres/include $CPPFLAGS" - AC_CHECK_HEADERS(postgresql/libpq-fe.h, - EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH" - POSTGRES_LDFLAGS="-L$with_postgres/lib" - POSTGRES_CPPFLAGS="-I$with_postgres/include" - postgres=true) - LDFLAGS=$SAVE_LDFLAGS - CPPFLAGS=$SAVE_CPPFLAGS - ;; - esac - ], - [AC_MSG_RESULT([--with-postgres not specified]) - AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)]) -AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) -AC_SUBST(POSTGRES_CPPFLAGS) -AC_SUBST(POSTGRES_LDFLAGS) +AX_LIB_POSTGRESQL([]) +if test "$found_postgresql" = "yes"; then + postgres=true +fi +AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) # test for zlib SAVE_LDFLAGS=$LDFLAGS diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 new file mode 100644 index 000000000..f02a13ac5 --- /dev/null +++ b/m4/ax_lib_postgresql.m4 @@ -0,0 +1,155 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_POSTGRESQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of PostgreSQL 'libpq' library +# of particular version or newer. +# +# AX_LIB_POSTGRESQL macro takes only one argument which is optional. If +# there is no required version passed, then macro does not run version +# test. +# +# The --with-postgresql option takes one of three possible values: +# +# no - do not check for PostgreSQL client library +# +# yes - do check for PostgreSQL library in standard locations (pg_config +# should be in the PATH) +# +# path - complete path to pg_config utility, use this option if pg_config +# can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(POSTGRESQL_CPPFLAGS) +# AC_SUBST(POSTGRESQL_LDFLAGS) +# AC_SUBST(POSTGRESQL_VERSION) +# +# And sets: +# +# HAVE_POSTGRESQL +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_LIB_POSTGRESQL], +[ + AC_ARG_WITH([postgresql], + AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@], + [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config] + ), + [ + if test "$withval" = "no"; then + want_postgresql="no" + elif test "$withval" = "yes"; then + want_postgresql="yes" + else + want_postgresql="yes" + PG_CONFIG="$withval" + fi + ], + [want_postgresql="yes"] + ) + + POSTGRESQL_CPPFLAGS="" + POSTGRESQL_LDFLAGS="" + POSTGRESQL_VERSION="" + + dnl + dnl Check PostgreSQL libraries (libpq) + dnl + + if test "$want_postgresql" = "yes"; then + + if test -z "$PG_CONFIG" -o test; then + AC_PATH_PROG([PG_CONFIG], [pg_config], []) + fi + + if test ! -x "$PG_CONFIG"; then + AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an exectuable file]) + PG_CONFIG="no" + found_postgresql="no" + fi + + if test "$PG_CONFIG" != "no"; then + AC_MSG_CHECKING([for PostgreSQL libraries]) + + POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" + POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" + + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` + + AC_DEFINE([HAVE_POSTGRESQL], [1], + [Define to 1 if PostgreSQL libraries are available]) + + found_postgresql="yes" + AC_MSG_RESULT([yes]) + else + found_postgresql="no" + AC_MSG_RESULT([no]) + fi + fi + + dnl + dnl Check if required version of PostgreSQL is available + dnl + + + postgresql_version_req=ifelse([$1], [], [], [$1]) + + if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then + + AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req]) + + dnl Decompose required version string of PostgreSQL + dnl and calculate its number representation + postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'` + postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$postgresql_version_req_micro" = "x"; then + postgresql_version_req_micro="0" + fi + + postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \ + \+ $postgresql_version_req_minor \* 1000 \ + \+ $postgresql_version_req_micro` + + dnl Decompose version string of installed PostgreSQL + dnl and calculate its number representation + postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'` + postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` + postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$postgresql_version_micro" = "x"; then + postgresql_version_micro="0" + fi + + postgresql_version_number=`expr $postgresql_version_major \* 1000000 \ + \+ $postgresql_version_minor \* 1000 \ + \+ $postgresql_version_micro` + + postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number` + if test "$postgresql_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + + AC_SUBST([POSTGRESQL_VERSION]) + AC_SUBST([POSTGRESQL_CPPFLAGS]) + AC_SUBST([POSTGRESQL_LDFLAGS]) +]) 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 #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 /** 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 +#include #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 -- cgit v1.2.3