Original commit message from CVS: compile fixen, and prepare to move MAINTAINER_MODE to as-version.m4