Fixes for build-system changes

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>