This commit might fix all problems with the buildsystem.