Skip to content

Commit f63e7d0

Browse files
committed
try again
1 parent a9b2ba6 commit f63e7d0

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

postgresql-libpq-configure/configure

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3911,10 +3911,14 @@ if test ${ac_cv_POSTGRESQL_LIBS+y}
39113911
then :
39123912
printf %s "(cached) " >&6
39133913
else $as_nop
3914-
ac_cv_POSTGRESQL_LIBS="-lpq"
3914+
ac_cv_POSTGRESQL_LIBS="`"$PG_CONFIG" --libs`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
39153915
fi
39163916
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_LIBS" >&5
39173917
printf "%s\n" "$ac_cv_POSTGRESQL_LIBS" >&6; }
3918+
if test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"
3919+
then :
3920+
break
3921+
fi
39183922
POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
39193923
39203924
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the PostgreSQL version" >&5
@@ -3987,6 +3991,8 @@ then :
39873991
break
39883992
fi
39893993
3994+
$PG_CONFIG
3995+
39903996
found_postgresql="yes"
39913997
break
39923998
done

postgresql-libpq-configure/m4/ax_lib_postgresql.m4

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
7575
POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
7676
7777
AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
78-
[ac_cv_POSTGRESQL_LIBS="-lpq"])
78+
[ac_cv_POSTGRESQL_LIBS="`"$PG_CONFIG" --libs`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
79+
AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
7980
POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
8081
8182
AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
@@ -98,6 +99,8 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
9899
])
99100
AS_IF([test "X$found_postgresql_req_version" = "Xno"],[break])
100101
102+
$PG_CONFIG
103+
101104
found_postgresql="yes"
102105
break
103106
done

0 commit comments

Comments
 (0)