From dab01380434c60e088c5c8e7416b35e867e8733f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 10 Feb 2017 18:43:43 +0100 Subject: [PATCH] make more use of 'use' in library detection now that it works nicely, make use of it for the zlib deps, which are not transitive when the detected library is built statically. Change-Id: Iaed87a37b36f714f0b919244cd84809650102ba9 Reviewed-by: Lars Knoll --- src/gui/configure.json | 7 ++++--- src/sql/configure.json | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json index 9b93bcf3e2..68bc43b5ca 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -159,9 +159,10 @@ "test": "unix/libpng", "sources": [ { "type": "pkgConfig", "args": "libpng" }, - { "libs": "-llibpng -lzdll", "condition": "config.msvc" }, - { "libs": "-lpng -lz", "condition": "!config.msvc" } - ] + { "libs": "-llibpng", "condition": "config.msvc" }, + { "libs": "-lpng", "condition": "!config.msvc" } + ], + "use": "zlib" }, "mirclient": { "label": "Mir client libraries", diff --git a/src/sql/configure.json b/src/sql/configure.json index 4c24d1913b..45b3fd9dd1 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -114,8 +114,10 @@ "test": "unix/sqlite", "sources": [ { "type": "pkgConfig", "args": "sqlite3" }, - { "libs": "-lsqlite3", "condition": "config.win32" }, - { "libs": "-lsqlite3 -lz", "condition": "!config.win32" } + "-lsqlite3" + ], + "use": [ + { "lib": "zlib", "condition": "!config.win32" } ] } },