Adapt to some upstream oyranos buildsystem changes.