Revert "adjust configure.ac for previous changes"

This reverts commit 84c8cccd00476046c23b4a0e9324ee80d23fc3ba.