[glib-networking/mcatanzaro/auto-features] Remove auto features

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 124f021ce4fc4ae67b9b4fe1c217b00a8a584c02
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Aug 15 12:27:55 2022 -0500

    Remove auto features
    
    I tried to be too clever here and enabled environment proxy support by
    default whenever libproxy is disabled. This strategy fails because all
    distros enable auto features:
    
    https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/217#note_1529568
    
    The solution is to enable libproxy by default, and disable environment
    proxy by default. This leaves only two remaining auto features: GnuTLS,
    which is almost always wanted, and GNOME proxy, which is also almost
    always wanted. Just pick the right defaults. If you don't want these
    enabled, pass the flag to disable them. Simple

 meson.build       | 4 ----
 meson_options.txt | 4 ++--
 proxy/meson.build | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index f8036056..5465815c 100644
--- a/meson.build
+++ b/meson.build
@@ -71,10 +71,6 @@ assert(gio_module_dir != '', 'GIO_MODULE_DIR is missing from gio-2.0.pc')
 # *** Checks for LibProxy   ***
 libproxy_dep = dependency('libproxy-1.0', version: '>= 0.4.16', required: get_option('libproxy'))
 
-# *** Checks for environment proxy ***
-environment_proxy_option = get_option('environment_proxy')
-environment_proxy_enabled = environment_proxy_option.enabled() or (environment_proxy_option.auto() and not 
libproxy_dep.found())
-
 # *** Checks for GNOME      ***
 gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', required: get_option('gnome_proxy'))
 
diff --git a/meson_options.txt b/meson_options.txt
index c566ccd0..dd08e46b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,8 +6,8 @@
 # without libproxy.
 option('gnutls', type: 'feature', value: 'auto', description: 'support for GnuTLS networking configration')
 option('openssl', type: 'feature', value: 'disabled', description: 'support for OpenSSL networking 
configration')
-option('environment_proxy', type: 'feature', value: 'auto', description: 'support for environment variable 
proxy configuration')
-option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration')
+option('environment_proxy', type: 'feature', value: 'disabled', description: 'support for environment 
variable proxy configuration')
+option('libproxy', type: 'feature', value: 'enabled', description: 'support for libproxy proxy configration')
 option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy 
configuration')
 option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests')
 option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)')
diff --git a/proxy/meson.build b/proxy/meson.build
index 266cea4e..4995847b 100644
--- a/proxy/meson.build
+++ b/proxy/meson.build
@@ -6,7 +6,7 @@ if gsettings_desktop_schemas_dep.found()
   subdir('gnome')
 endif
 
-if environment_proxy_enabled
+if get_option('environment_proxy')
   subdir('environment')
 endif