[PATCH] New Athena configure support done.