Merge pull request #1455 from rubenk/configure-ac-remove-dead-code