Enable building of freetype2 and wayland demos
    
    Also-it appears in order to make this continue to both build the x11 and
    wayland demos and not just one or the other, we need to start manually
    specifying the options for %configure. We probably should have been
    doing that from the start anyhow.