summaryrefslogtreecommitdiff
path: root/proxy
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@redhat.com>2022-08-05 13:29:12 -0500
committerMichael Catanzaro <mcatanzaro@redhat.com>2022-08-05 15:03:35 -0500
commitcb3f08fabb6e762c26251e8bc2281f413c94de20 (patch)
tree9fce3a98b102ac4c3697e11dd81c63e5a9ed5a94 /proxy
parent6e2cf4fb856a2fa1d136f8a2af73791cbc8d3d45 (diff)
downloadglib-networking-cb3f08fabb6e762c26251e8bc2281f413c94de20.tar.gz
Add build option for environment proxy resolver
Since fixing #190, the environment proxy resolver is now redundant with libproxy and there is no reason for it to be built or installed if libproxy is enabled. Accordingly, let's give it its own build option. It will be enabled by default if libproxy is enabled, and disabled by default otherwise. Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/217>
Diffstat (limited to 'proxy')
-rw-r--r--proxy/meson.build4
1 files changed, 1 insertions, 3 deletions
diff --git a/proxy/meson.build b/proxy/meson.build
index c638452..266cea4 100644
--- a/proxy/meson.build
+++ b/proxy/meson.build
@@ -6,9 +6,7 @@ if gsettings_desktop_schemas_dep.found()
subdir('gnome')
endif
-# FIXME: This ought to work on Windows.
-# https://gitlab.gnome.org/GNOME/glib-networking/-/issues/185
-if not ['windows'].contains(host_system)
+if environment_proxy_enabled
subdir('environment')
endif