From 34501e3f3269993f0810081663c265c29eeeb16e Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 19 Aug 2024 17:36:54 +0300 Subject: [PATCH] WIP3 --- postgresql-libpq-pgconfig/configure | 5 ++++- postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/postgresql-libpq-pgconfig/configure b/postgresql-libpq-pgconfig/configure index 0da9f1d..5218063 100755 --- a/postgresql-libpq-pgconfig/configure +++ b/postgresql-libpq-pgconfig/configure @@ -3732,7 +3732,8 @@ else found_postgresql=no fi else $as_nop - if test -n "$PKG_CONFIG" && \ + echo "foo1 $found_postgresql" + if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= \"\$postgresql_version_req\"\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq >= "$postgresql_version_req"") 2>&5 ac_status=$? @@ -3743,10 +3744,12 @@ else found_postgresql=no fi fi + echo "foo2 $found_postgresql" if test "X$found_postgresql" = "no" then : break fi + echo "foo3 $found_postgresql" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the PostgreSQL libraries CPPFLAGS" >&5 printf %s "checking for the PostgreSQL libraries CPPFLAGS... " >&6; } diff --git a/postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 b/postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 index cc7f695..4c75399 100644 --- a/postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 +++ b/postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 @@ -115,9 +115,12 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG], _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no; AS_IF([test "X$postgresql_version_req" = "X"], [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])], + echo "foo1 $found_postgresql" [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"], [found_postgresql=yes],[found_postgresql=no])]) + echo "foo2 $found_postgresql" AS_IF([test "X$found_postgresql" = "no"],[break]) + echo "foo3 $found_postgresql" AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS], [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])