configure.ac: fixes for build problems introduced by changeset 22617.