[taler-merchant] branch master updated: -improve postgres check

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new a8127825 -improve postgres check
     new 70506497 Merge branch 'master' of git+ssh://git.taler.net/merchant
a8127825 is described below

commit a81278253f05d99d95b1b7732991e80476cfbd90
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Dec 8 14:20:43 2022 +0100

    -improve postgres check
---
 configure.ac | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b2c1deb..5293f3f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,10 +91,19 @@ AS_IF([test $libgnunetutil != 1],
 
 
 # test for postgres
-AX_LIB_POSTGRESQL([9.3])
-AS_IF([test "x$found_postgresql" = "xyes"],[postgres=true])
-AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
-
+AX_LIB_POSTGRESQL([13.0])
+AS_IF([test "x$found_postgresql" = "xyes"],
+  [SAVE_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$POSTGRES_CPPFLAGS $CPPFLAGS"
+   AC_CHECK_HEADERS([libpq-fe.h], [postgres=1], [postgres=0])])
+AS_IF([test "x$postgres" != "x1"],
+  [AC_MSG_ERROR([[
+***
+*** You need libpq(-dev) >= 13.0 to build this program.
+*** ]])])
+AM_CONDITIONAL([HAVE_POSTGRESQL], [test "x$postgres" = "x1"])
+AC_DEFINE_UNQUOTED([HAVE_POSTGRESQL], [$postgres],
+                   [Define to 1 if Postgres is available])
 
 TALER_LIB_LDFLAGS="-export-dynamic -no-undefined"
 TALER_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.