diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-07-04 00:24:59 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-07-04 00:26:04 +0200 |
| commit | 843933bf867b1d5b3830418290fe3e8bad904efc (patch) | |
| tree | 8e8042bbe34c117a40867d498fbc147cd864ab32 /m4 | |
| parent | 8694fd2d067e52d853acd382cec8f3499599da23 (diff) | |
| download | merchant-843933bf867b1d5b3830418290fe3e8bad904efc.tar.gz merchant-843933bf867b1d5b3830418290fe3e8bad904efc.tar.bz2 merchant-843933bf867b1d5b3830418290fe3e8bad904efc.zip | |
fix pg version check on Debian
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_lib_postgresql.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 index e81c0996..11b6991f 100644 --- a/m4/ax_lib_postgresql.m4 +++ b/m4/ax_lib_postgresql.m4 @@ -38,7 +38,6 @@ # LICENSE # # Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net> -# Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice @@ -81,7 +80,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], fi if test ! -x "$PG_CONFIG"; then - AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an exectuable file]) + dnl AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an exectuable file]) PG_CONFIG="no" found_postgresql="no" fi @@ -92,7 +91,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" - POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##' | awk '{print $1}'` AC_DEFINE([HAVE_POSTGRESQL], [1], [Define to 1 if PostgreSQL libraries are available]) @@ -114,7 +113,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then - AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req]) + AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req]) dnl Decompose required version string of PostgreSQL dnl and calculate its number representation |