Issue #17603: Merge configure.ac fix from 3.5