From 94bd6e22ffe761b6aed640cc5dd53a94daa8d8a3 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Mon, 13 Feb 2012 15:28:45 +0100 Subject: [PATCH] Dropping Magick++ for libpng and pngwriter --- SConstruct | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/SConstruct b/SConstruct index eb1566e04..8c0545a8e 100644 --- a/SConstruct +++ b/SConstruct @@ -120,13 +120,8 @@ if not conf.CheckLibWithHeader('xml2', 'libxml/xmlreader.h', 'CXX'): if not conf.CheckLibWithHeader('z', 'zlib.h', 'CXX'): print "zlib library or header not found. Exiting" Exit(-1) -if not (env.Detect('Magick++-config')): - print 'Magick++-config compiler not found' - Exit(-1); -else: - env.ParseConfig('Magick++-config --cppflags --ldflags') -if not conf.CheckLibWithHeader('Magick++', 'ImageMagick/Magick++.h', 'CXX'): - print "Magick++ library or header not found. Exiting" +if not conf.CheckLibWithHeader('png', 'png.h', 'CXX'): + print "png library or header not found. Exiting" Exit(-1) #Check BOOST installation if not (conf.CheckBoost('1.41')):