From 4e1eb39703e380c70b91b57bced489373eaf7247 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 23 May 2015 17:20:51 +0100 Subject: Better Magick++ library checking. --- wscript | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9f9a61c6..8bedae22 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,7 @@ import subprocess import os import sys +import distutils.spawn APPNAME = 'libdcp' VERSION = '1.00.0devel' @@ -40,7 +41,16 @@ def configure(conf): conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1] - conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=False) + + # ImageMagick / GraphicsMagick + if distutils.spawn.find_executable('Magick++-config'): + conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + else: + image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) + graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) + if image is None and graphics is None: + Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') + conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) if conf.options.static: -- cgit v1.2.3