The dreaded readline, again

I'm trying to install PG on my new OpenBSD machine. I installed the
latest version of GNU readline in the usual place (defaults to
/usr/local/...) and then I did ./configure in the src/ directory of
PG7.03. This should have detected readline properly, but when I tried
psql, I couldn't use the history function.

So I cleared PG and did ./configure
--with-includes=/usr/local/include/readline and then I compiled again,
and this time, psql wouldn't compile at all, with this error:

tab-complete.c: In function `psql_completion':
tab-complete.c:230: `rl_completion_append_character' undeclared (first use in this function)

I know this is a FAQ, but I searched around the net and couldn't come
up with any answers. Any ideas of how to get them to work together?

Thanks