* automake.in ($seen_lispdir): Replace with... ($am_lispdir_location): this. (&require_conf_file): New. (&require_config_file, &require_conf_file_with_line, (&require_conf_file_with_conf_line): Use it. (&require_conf_file_with_macro): New.