Update for Meson in mainline (#8)