merge configure script changes from master to branch