Updated configure script  and build.sh to build universal binary when compiling on mac os x
Fixed configure script coflicts