Really add the schema, and some related autoconf/automake fixes