From 631b4472688a392e0fec5ad1c081a2f766301345 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 20 May 2011 17:15:08 +0200 Subject: [PATCH] SCons: check for official GDL prior to searching our gdl-lum ...most current systems provide a suitable GDL package, thus our curstom package is rarely necessary. --- SConstruct | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 9665854f4..a2f6750cf 100644 --- a/SConstruct +++ b/SConstruct @@ -284,11 +284,11 @@ def configurePlatform(env): problems.append('Unable to configure Cairo--') verGDL = '2.27.1' - if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'): - print 'Custom package "gdl-lum" not found. Trying official GDL release >=%s...' % verGDL - if not conf.CheckPkgConfig('gdl-1.0', verGDL, alias='gdl'): - problems.append('GNOME Docking Library not found. We either need a very recent GDL ' - 'version (>=%s), or the custom package "gdl-lum".' % verGDL) + if not conf.CheckPkgConfig('gdl-1.0', verGDL, alias='gdl'): + print 'No sufficiently recent (>=%s) version of GDL found. Maybe use custom package gdl-lum?' % verGDL + if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'): + problems.append('GNOME Docking Library not found. We either need a sufficiently recent GDL ' + 'version (>=%s), or the custom package "gdl-lum" from Lumiera.org.' % verGDL) if not conf.CheckPkgConfig('librsvg-2.0', '2.18.1'): problems.append('Need rsvg Library for rendering icons.')