[libsoup] meson: simplify test dependencies and bring back LD_LIBRARY_PATH workaround

[Claudio Saavedra <csaavedra src gnome org>]

commit a4b5e3a1e5447475f711f3d34bf92eb58a99d1f5
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Tue Mar 19 15:38:15 2019 +0200

    meson: simplify test dependencies and bring back LD_LIBRARY_PATH workaround
    
    I was wrong to think that the workaround is not needed anymore.

 tests/meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index 2882c27a..90c0bed7 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,10 +2,10 @@ test_utils_name = 'test-utils'
 
 if cc.get_id() == 'msvc'
   test_utils = static_library(test_utils_name, test_utils_name + '.c',
-    dependencies : [glib_dep, libsoup_dep])
+    dependencies : libsoup_dep)
 else
   test_utils = library(test_utils_name, test_utils_name + '.c',
-    dependencies : [glib_dep, libsoup_dep])
+    dependencies : libsoup_dep)
 endif
 
 test_resources = gnome.compile_resources('soup-tests',
@@ -97,6 +97,8 @@ env = environment()
 env.set('G_TEST_SRCDIR', meson.current_source_dir())
 env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 env.set('G_DEBUG', 'gc-friendly')
+# See https://github.com/mesonbuild/meson/issues/1383 for the workaround below
+env.prepend('LD_LIBRARY_PATH', meson.build_root() + '/libsoup')
 env.set('MALLOC_CHECK_', '2')
 # This is set by Meson if empty
 env.set('MALLOC_PERTURB_', '')
@@ -113,4 +115,4 @@ foreach test: tests
 endforeach
 
 executable('ntlm-test-helper', 'ntlm-test-helper.c',
-  dependencies : [glib_dep, libsoup_dep])
+  dependencies : libsoup_dep)