Automake 1.11 and Branch

[rgheck]

Can someone update branch to automake 1.11? I can't build anymore.... I 
know this was done for trunk.

rh