From 5416008f28127dd731622b92750ac7f8c35c4977 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 14 Jun 2009 21:25:33 +0200 Subject: [PATCH] Error out if libhildon is available but not libosso libhildon remains optional but we assume that it makes no sense to use it without libosso. --- wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index 3a2f4f43..cfd2a196 100644 --- a/wscript +++ b/wscript @@ -140,6 +140,7 @@ def configure (conf): var = name.split ('-')[0].upper () conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs ' + args, atleast_version=version, mandatory=mandatory) + return conf.env['HAVE_' + var] if option_enabled ('unique'): check_pkg ('unique-1.0', '0.9', False) @@ -183,9 +184,8 @@ def configure (conf): check_pkg ('libxml-2.0', '2.6') if option_enabled ('hildon'): - check_pkg ('hildon-1', mandatory=False, var='HILDON') - if conf.env['HAVE_HILDON'] == 1: - check_pkg ('libosso', mandatory=False, var='HILDON') + if check_pkg ('hildon-1', mandatory=False, var='HILDON'): + check_pkg ('libosso', var='HILDON') hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] if hildon != 'yes': option_checkfatal ('hildon', 'Maemo integration') -- 2.39.5