projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5946dcf)
imagemagick: fix CONFIG_SCRIPTS handling when C++ isn't available
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 9 Feb 2013 11:13:59 +0000 (12:13 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 9 Feb 2013 11:13:59 +0000 (12:13 +0100)
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>
package/imagemagick/imagemagick.mk patch | blob | history

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 722ab40038e47227ce6adf176c82aad0702be817..def7a5dd4bcebf52e5c19244e2549f7558591d2a 100644 (file)
--- 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