Original commit message from CVS: fix shout2 check to check for the version
Original commit message from CVS: fix underquotedness of macros
Original commit message from CVS: Added shout m4