Merge pull request #2035 from arnova/configure_fix