code cleanup; revert a change in configure.ac