* automake.in (&variable_conditionally_defined): Rename as...

* automake.in (&variable_conditionally_defined): Rename as...
(&check_variable_unconditionally_defined): this.
(&variable_dump): Fix the output.
(&variable_defined, &macro_define): Since conditions are
canonicalized, don't use a loop to look for a condition: read the
hash.
(&macro_define, &rule_define, &read_am_file, &file_contents):
Rename $cond_string as $cond.
* distdir.am (PACKAGE, VERSION): Remove; since they are already
discovered via AC_SUBST, they now trigger a `defined twice' error.