Modify bootstrap and Makefile.am