Revert "Revert "Update configure""

This reverts commit 4a60f3275fae00349eb83cc168f294fe17a98bdb.