[glib-networking/gnutls426debug: 3/4] Revert "Add 'static-modules' option"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3baa32ee1bbf3572f50c2a5b9d4b9f4a40de24e6
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Apr 16 10:31:25 2018 -0500

    Revert "Add 'static-modules' option"
    
    This reverts commit a3e65ab8a9020749002ca2301a3d2c18e4c8e94a.

 meson_options.txt          |    1 -
 proxy/gnome/meson.build    |   10 +---------
 proxy/libproxy/meson.build |   10 +---------
 tls/gnutls/meson.build     |   10 +---------
 tls/pkcs11/meson.build     |    3 +--
 5 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index 1e04d19..d64126f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,4 +2,3 @@ option('libproxy_support', type: 'boolean', value: true, description: 'support f
 option('gnome_proxy_support', type: 'boolean', value: true, description: 'support for GNOME desktop proxy 
configuration')
 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')
diff --git a/proxy/gnome/meson.build b/proxy/gnome/meson.build
index ed90537..c1d96e7 100644
--- a/proxy/gnome/meson.build
+++ b/proxy/gnome/meson.build
@@ -11,7 +11,7 @@ deps = [
   gsettings_desktop_schemas_dep
 ]
 
-module = shared_module(
+shared_module(
   'giognomeproxy',
   sources: sources,
   include_directories: top_inc,
@@ -22,12 +22,4 @@ module = shared_module(
   install_dir: gio_module_dir
 )
 
-if get_option('static_modules')
-  static_library('giognomeproxy',
-    objects: module.extract_all_objects(),
-    install: true,
-    install_dir: gio_module_dir
-  )
-endif
-
 proxy_test_programs += [['gnome', deps]]
diff --git a/proxy/libproxy/meson.build b/proxy/libproxy/meson.build
index 95839ae..996a7a0 100644
--- a/proxy/libproxy/meson.build
+++ b/proxy/libproxy/meson.build
@@ -34,7 +34,7 @@ deps = [
   libproxy_dep
 ]
 
-module = shared_module(
+shared_module(
   'giolibproxy',
   sources: sources,
   include_directories: top_inc,
@@ -46,14 +46,6 @@ module = shared_module(
   install_dir: gio_module_dir
 )
 
-if get_option('static_modules')
-  static_library('giolibproxy',
-    objects: module.extract_all_objects(),
-    install: true,
-    install_dir: gio_module_dir
-  )
-endif
-
 sources = files(
   'glibproxyresolver.c',
   'glibpacrunner.c'
diff --git a/tls/gnutls/meson.build b/tls/gnutls/meson.build
index c4f5ef2..c025a65 100644
--- a/tls/gnutls/meson.build
+++ b/tls/gnutls/meson.build
@@ -33,7 +33,7 @@ if enable_pkcs11_support
   deps += libgiopkcs11_dep
 endif
 
-module = shared_module(
+shared_module(
   'giognutls',
   sources: sources,
   include_directories: incs,
@@ -43,11 +43,3 @@ module = shared_module(
   install: true,
   install_dir: gio_module_dir
 )
-
-if get_option('static_modules')
-  static_library('giognutls',
-    objects: module.extract_all_objects(),
-    install: true,
-    install_dir: gio_module_dir
-  )
-endif
diff --git a/tls/pkcs11/meson.build b/tls/pkcs11/meson.build
index 94f55d9..13bbb1d 100644
--- a/tls/pkcs11/meson.build
+++ b/tls/pkcs11/meson.build
@@ -17,8 +17,7 @@ libgiopkcs11 = static_library(
   'giopkcs11',
   sources: sources,
   include_directories: top_inc,
-  dependencies: deps,
-  install: get_option('static_modules')
+  dependencies: deps
 )
 
 libgiopkcs11_dep = declare_dependency(