* Add variants with[out]_quartz and with[out]_x11 * Move x11-specific dependencies and configure/build settings to variant with_x11 * Make +with_x11 +without_quartz the default variants * Include variants quartz and no_x11 as calls to with_quartz and without_x11 until such a time as they are no longer required+variant quartz requires with_quartz {} +variant no_x11 requires without_x11 {} +