Merge changes I627eb724,I55d5865b

* changes:
  configure: add a test for configured source dir
  Makefile: add distclean target