summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-02-09 11:13:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-09 11:13:59 (GMT)
commit47b3a845cfa171a4f76c6c213e027acf4607c1c7 (patch)
treeb7229d879f37db39c133fef7383704346fd460ac
parent5946dcfc582370fa8b55f06517a98bac2b2c1c1e (diff)
downloadbuildroot-47b3a845cfa171a4f76c6c213e027acf4607c1c7.tar.gz
buildroot-47b3a845cfa171a4f76c6c213e027acf4607c1c7.tar.bz2
imagemagick: fix CONFIG_SCRIPTS handling when C++ isn't available
Fixes http://autobuild.buildroot.org/results/0b35567af8a41a14c9c33f3be5299978c5847e03 Magick++-config only gets installed when C++ support is detected. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/imagemagick/imagemagick.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 722ab40..def7a5d 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -17,7 +17,11 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE
IMAGEMAGICK_INSTALL_STAGING = YES
IMAGEMAGICK_AUTORECONF = YES
IMAGEMAGICK_CONFIG_SCRIPTS = \
- $(addsuffix -config,Magick MagickCore MagickWand Wand Magick++)
+ $(addsuffix -config,Magick MagickCore MagickWand Wand)
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
+endif
ifeq ($(BR2_LARGEFILE),y)
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64