Compile failure due to libwrap on Ubuntu 11.10

Hi,

I've just recently updated to 11.10 and thought I'd get upto date on
the trunk. It seems that there is some autotools breakage for libwrap.
I get the following compile error:

/bin/sh ../libtool  --tag=CC   --mode=link gcc -g -O2 -D_GNU_SOURCE
-fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow
-Wpointer-arith -Wcast-align -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -Winline
-Wold-style-definition -W  -fPIC -DPIC -g -O2 -D_GNU_SOURCE
-fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow
-Wpointer-arith -Wcast-align -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -Winline
-Wold-style-definition -W  -fPIC -DPIC   -o rrdcached
rrdcached-rrd_daemon.o librrd_th.la
libtool: link: gcc -g -O2 -D_GNU_SOURCE -fno-strict-aliasing -Wall
-std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline
-Wold-style-definition -W -fPIC -DPIC -g -O2 -D_GNU_SOURCE
-fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow
-Wpointer-arith -Wcast-align -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -Winline
-Wold-style-definition -W -fPIC -DPIC -o .libs/rrdcached
rrdcached-rrd_daemon.o  ./.libs/librrd_th.so -pthread -Wl,-rpath
-Wl,/opt/rrdtool-1.4.3/lib
rrdcached-rrd_daemon.o: In function `connection_thread_main':
/export/csrc/packages/rrdtool/rrdtool.git-svn/src/rrd_daemon.c:2657:
undefined reference to `request_init'
/export/csrc/packages/rrdtool/rrdtool.git-svn/src/rrd_daemon.c:2658:
undefined reference to `sock_host'
/export/csrc/packages/rrdtool/rrdtool.git-svn/src/rrd_daemon.c:2659:
undefined reference to `hosts_access'
/export/csrc/packages/rrdtool/rrdtool.git-svn/src/rrd_daemon.c:2660:
undefined reference to `eval_client'
/export/csrc/packages/rrdtool/rrdtool.git-svn/src/rrd_daemon.c:2660:
undefined reference to `eval_client'
collect2: ld returned 1 exit status
make[2]: *** [rrdcached] Error 1
make[2]: Leaving directory `/export/csrc/packages/rrdtool/rrdtool.git-svn/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/export/csrc/packages/rrdtool/rrdtool.git-svn'
make: *** [all] Error 2

Manually adding -lwrap to gcc fixes the problem. The autoconf magic is
detecting libwrap but I'm unsure how to ensure the link magic is
suitably set. The .la files contain references to it:

$ grep "wrap" src/librrd_th.la
dependency_libs=' -lpthread /usr/lib/libxml2.la -lwrap
/usr/lib/libdbi.la -lm -ldl -lpng12
/usr/lib/x86_64-linux-gnu/libpangocairo-1.0.la
/usr/lib/x86_64-linux-gnu/libpango-1.0.la
/usr/lib/x86_64-linux-gnu/libcairo.la -lgobject-2.0 -lgmodule-2.0 -lrt
-lglib-2.0'

Can anyone with more knowledge of automagic point me in the right direction?

-- 
Alex, homepage: http://www.bennee.com/~alex/
http://www.half-llama.co.uk