[glib-networking/glib-2-56] Revert "meson: improve GIO modules directory handling"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8678c1679fb140014ecc2ffb113f55a1c3cc73e1
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Mar 15 11:05:57 2018 -0500

    Revert "meson: improve GIO modules directory handling"
    
    This reverts commit bb6f8fc39d019e975b0f9ef272b99f8ffee464ce.
    
    Let's try a different approach...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794358

 meson.build       |    5 +----
 meson_options.txt |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index d406262..0eb39e3 100644
--- a/meson.build
+++ b/meson.build
@@ -46,10 +46,7 @@ endif
 glib_dep = dependency('glib-2.0', version: '>= 2.55.1')
 gio_dep = dependency('gio-2.0')
 
-gio_module_dir = get_option('gio_module_dir')
-if gio_module_dir == ''
-  gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir')
-endif
+gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir')
 assert(gio_module_dir != '', 'GIO_MODULE_DIR is missing from gio-2.0.pc')
 
 # *** Checks for LibProxy   ***
diff --git a/meson_options.txt b/meson_options.txt
index 25d9a2e..8cf58ed 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,4 +4,3 @@ option('ca_certificates_path', type: 'string', value: '', description: 'path to
 option('pkcs11_support', type: 'boolean', value: true, description: 'support for PKCS#11 using p11-kit')
 option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests')
 option('static_modules', type: 'boolean', value: false, description: 'build static modules')
-option('gio_module_dir', type: 'string', value: '', description: 'custom directory for GIO modules')