missed a spot
Correct spelling in comment
Cleanup whitespace
Avoid using AM_CONF_IF

Apparently this is a fairly recent feature of automake and is not
present on at least CentOS5.
Merge recent libzrtp autotools changes