3d6e2830 silenced the autogen.sh warnings as it was supposed to, but
introduced two bugs. Fix them.