Fixes for make dist and make distcheck

Conflicts:
	configure.ac