Imported Upstream version 2.74.0

[platform/upstream/glib-networking.git] / proxy / libproxy / meson.build

diff --git a/proxy/libproxy/meson.build b/proxy/libproxy/meson.build
index e459bc1..1efa99c 100644 (file)
--- a/proxy/libproxy/meson.build
+++ b/proxy/libproxy/meson.build
@@ -34,6 +34,8 @@ deps = [
   libproxy_dep
 ]
 
+giomodules += 'giolibproxy'
+
 module = shared_module(
   'giolibproxy',
   sources: sources,
@@ -47,13 +49,17 @@ module = shared_module(
   install_dir: gio_module_dir
 )
 
-if get_option('static_modules')
-  static_library('giolibproxy',
-    objects: module.extract_all_objects(),
+if get_option('static_modules') or get_option('default_library') != 'shared'
+  giolibproxy_lib = static_library('giolibproxy',
+    objects: module.extract_all_objects(recursive: true),
+    dependencies: deps,
     install: true,
     install_dir: gio_module_dir
   )
   pkg.generate(module)
+
+  giolibproxy_dep = declare_dependency(link_with: giolibproxy_lib)
+  meson.override_dependency('giolibproxy', giolibproxy_dep)
 endif
 
 sources = files(
@@ -66,9 +72,14 @@ executable(
   sources,
   include_directories: top_inc,
   dependencies: deps,
-  c_args: '-DGLIBPROXY_PACRUNNER',
   install: true,
   install_dir: libexecdir
 )
 
-proxy_test_programs += [['libproxy', deps]]
+proxy_test_programs += [['environment', 'libproxy', deps]]
+
+if meson.version().version_compare('>=0.58')
+  env = environment()
+  env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+  meson.add_devenv(env)
+endif