fix old buildsystem (closes #12)
don't build java tests with --disable-java (#13)
Merge branch 'master' into pvs/include-restructure