Skip to content

Commit

Permalink
WIP3
Browse files Browse the repository at this point in the history
  • Loading branch information
phadej committed Aug 19, 2024
1 parent 2e56a83 commit 34501e3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 4 additions & 1 deletion postgresql-libpq-pgconfig/configure
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?
Expand All @@ -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; }
Expand Down
3 changes: 3 additions & 0 deletions postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit 34501e3

Please sign in to comment.