Merge "changed configure option name to reduce confusion"