diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
| commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
| tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/imagemagick | |
| parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff) | |
| download | buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.zip | |
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/imagemagick')
| -rw-r--r-- | package/imagemagick/imagemagick.mk | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index cc4d01b5af..88d1196dc5 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -28,7 +28,7 @@ else IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32 endif -IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \ +IMAGEMAGICK_CONF_OPTS = --program-transform-name='s,,,' \ --disable-openmp \ --without-perl \ --without-wmf \ @@ -45,78 +45,78 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \ IMAGEMAGICK_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -IMAGEMAGICK_CONF_OPT += --with-fontconfig +IMAGEMAGICK_CONF_OPTS += --with-fontconfig IMAGEMAGICK_DEPENDENCIES += fontconfig else -IMAGEMAGICK_CONF_OPT += --without-fontconfig +IMAGEMAGICK_CONF_OPTS += --without-fontconfig endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -IMAGEMAGICK_CONF_OPT += --with-freetype +IMAGEMAGICK_CONF_OPTS += --with-freetype IMAGEMAGICK_CONF_ENV += \ ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config IMAGEMAGICK_DEPENDENCIES += freetype else -IMAGEMAGICK_CONF_OPT += --without-freetype +IMAGEMAGICK_CONF_OPTS += --without-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) -IMAGEMAGICK_CONF_OPT += --with-jpeg +IMAGEMAGICK_CONF_OPTS += --with-jpeg IMAGEMAGICK_DEPENDENCIES += jpeg else -IMAGEMAGICK_CONF_OPT += --without-jpeg +IMAGEMAGICK_CONF_OPTS += --without-jpeg endif ifeq ($(BR2_PACKAGE_LIBPNG),y) -IMAGEMAGICK_CONF_OPT += --with-png +IMAGEMAGICK_CONF_OPTS += --with-png IMAGEMAGICK_DEPENDENCIES += libpng else -IMAGEMAGICK_CONF_OPT += --without-png +IMAGEMAGICK_CONF_OPTS += --without-png endif ifeq ($(BR2_PACKAGE_LIBRSVG),y) -IMAGEMAGICK_CONF_OPT += --with-rsvg +IMAGEMAGICK_CONF_OPTS += --with-rsvg IMAGEMAGICK_DEPENDENCIES += librsvg else -IMAGEMAGICK_CONF_OPT += --without-rsvg +IMAGEMAGICK_CONF_OPTS += --without-rsvg endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -IMAGEMAGICK_CONF_OPT += --with-xml +IMAGEMAGICK_CONF_OPTS += --with-xml IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config IMAGEMAGICK_DEPENDENCIES += libxml2 else -IMAGEMAGICK_CONF_OPT += --without-xml +IMAGEMAGICK_CONF_OPTS += --without-xml endif ifeq ($(BR2_PACKAGE_TIFF),y) -IMAGEMAGICK_CONF_OPT += --with-tiff +IMAGEMAGICK_CONF_OPTS += --with-tiff IMAGEMAGICK_DEPENDENCIES += tiff else -IMAGEMAGICK_CONF_OPT += --without-tiff +IMAGEMAGICK_CONF_OPTS += --without-tiff endif ifeq ($(BR2_PACKAGE_FFTW),y) # configure script misdetects these leading to build errors IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes -IMAGEMAGICK_CONF_OPT += --with-fftw +IMAGEMAGICK_CONF_OPTS += --with-fftw IMAGEMAGICK_DEPENDENCIES += fftw else -IMAGEMAGICK_CONF_OPT += --without-fftw +IMAGEMAGICK_CONF_OPTS += --without-fftw endif ifeq ($(BR2_PACKAGE_ZLIB),y) -IMAGEMAGICK_CONF_OPT += --with-zlib +IMAGEMAGICK_CONF_OPTS += --with-zlib IMAGEMAGICK_DEPENDENCIES += zlib else -IMAGEMAGICK_CONF_OPT += --without-zlib +IMAGEMAGICK_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_BZIP2),y) -IMAGEMAGICK_CONF_OPT += --with-bzlib +IMAGEMAGICK_CONF_OPTS += --with-bzlib IMAGEMAGICK_DEPENDENCIES += bzip2 else -IMAGEMAGICK_CONF_OPT += --without-bzlib +IMAGEMAGICK_CONF_OPTS += --without-bzlib endif $(eval $(autotools-package)) |
