revert to expecting HAVE_CAIRO defined