Skip to content

Commit

Permalink
again
Browse files Browse the repository at this point in the history
  • Loading branch information
phadej committed Aug 19, 2024
1 parent 34501e3 commit 47db1fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
12 changes: 3 additions & 9 deletions postgresql-libpq-pgconfig/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3732,8 +3732,7 @@ else
found_postgresql=no
fi
else $as_nop
echo "foo1 $found_postgresql"
if test -n "$PKG_CONFIG" && \
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 @@ -3744,12 +3743,10 @@ else
found_postgresql=no
fi
fi
echo "foo2 $found_postgresql"
if test "X$found_postgresql" = "no"
if test "X$found_postgresql" = "Xno"
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 Expand Up @@ -4006,16 +4003,14 @@ then :
_AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
LIBS="$LIBS $POSTGRESQL_LIBS"
while true; do
echo "foo $CPPFLAGS $LDFLAGS $LIBS"
ac_fn_c_check_header_compile "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
ac_fn_c_check_header_compile "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
if test "x$ac_cv_header_libpq_fe_h" = xyes
then :
else $as_nop
found_postgresql=no
fi
echo "foo $found_postgresql"
if test "X$found_postgresql" = "Xno"
then :
break
Expand All @@ -4027,7 +4022,6 @@ then :
printf %s "(cached) " >&6
else $as_nop
echo "here $CPPFLAGS $LDFLAGS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Expand Down
8 changes: 1 addition & 7 deletions postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,9 @@ 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"
AS_IF([test "X$found_postgresql" = "Xno"],[break])
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 Expand Up @@ -204,14 +201,11 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
LIBS="$LIBS $POSTGRESQL_LIBS"
while true; do
dnl try to compile
echo "foo $CPPFLAGS $LDFLAGS $LIBS"
AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
echo "foo $found_postgresql"
AS_IF([test "X$found_postgresql" = "Xno"],[break])
dnl try now to link
AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
[
echo "here $CPPFLAGS $LDFLAGS $LIBS"
AC_LINK_IFELSE([
AC_LANG_PROGRAM(
[
Expand Down

0 comments on commit 47db1fa

Please sign in to comment.