new libpng error while compiling Wayland now

[nerdopolis]

Hi.

When I try to compile Wayland now, I get an error when make tries to build a 
client. (although weston builds)

--------------------------
/usr/bin/ld: libtoytoolkit.a(cairo-util.o): undefined reference to symbol 
'png_set_filler@@PNG12_0'
/usr/bin/ld: note: 'png_set_filler@@PNG12_0' is defined in DSO /usr/lib/i386-
linux-gnu/libpng12.so.0 so try adding it to the linker command line
/usr/lib/i386-linux-gnu/libpng12.so.0: could not read symbols: Invalid 
operation
collect2: ld returned 1 exit status
make[3]: [weston-terminal] Error 1 (ignored)
test -z "/usr/local/bin" || /bin/mkdir -p "/usr/local/bin"
  CCLD   weston-desktop-shell
/usr/bin/ld: libtoytoolkit.a(cairo-util.o): undefined reference to symbol 
'png_set_filler@@PNG12_0'
/usr/bin/ld: note: 'png_set_filler@@PNG12_0' is defined in DSO /usr/lib/i386-
linux-gnu/libpng12.so.0 so try adding it to the linker command line
/usr/lib/i386-linux-gnu/libpng12.so.0: could not read symbols: Invalid 
operation
----------------------------

The only thing that I can see that would change this is appears to be 
(although I haven't tested for sure yet as i'm still building the live disk 
system) is http://cgit.freedesktop.org/wayland/wayland-
demos/commit/?id=804e05185b65b3ccff59586be916c8ff6acf3b4f 

This is on Ubuntu Precise which uses libpng 1.2.46

I just thought I should report this. 

Thanks.