Updated configure & Makefile
Updated configure & Makefile