Updated Autotools after the final master/adios-query merge