r7920: changes to compile on new automake and xfree_4.3.0_0pre1v1