Original commit message from CVS:
Revert the revert to 1.0.0 vorbis.m4 code.
This bugfix has been accepted upstream to fix a segfault due to a bogus
function parameter. (the cause of the segfault should probably be fixed but
until then...)