added --without-cimg
This commit is contained in:
parent
893c009424
commit
a0882e378a
@ -10,6 +10,7 @@
|
||||
- optionally use GraphicsMagick (thanks Bob Friesenhahn)
|
||||
- look for MAGICKCORE_HDRI_SUPPORT (thanks Marcel)
|
||||
- set icc profiles in tiff pyramids explicitly (thanks Joe)
|
||||
- add --without-cimg configure option
|
||||
- add im_maxpos_subpel
|
||||
- make im_abs compile without liboil
|
||||
- add im_align_bands
|
||||
|
2
TODO
2
TODO
@ -11,8 +11,6 @@
|
||||
or do we only need to link the cimg convenience library with g++? libtool
|
||||
should copy the libs up, shouldn't it?
|
||||
|
||||
add a --without-cimg option too
|
||||
|
||||
WONTFIX
|
||||
=======
|
||||
|
||||
|
15
configure.in
15
configure.in
@ -321,10 +321,23 @@ else
|
||||
AM_CONDITIONAL(HAVE_PYTHON, false)
|
||||
fi
|
||||
|
||||
# make CImg wrapper? including C++ source causes link problems on some
|
||||
# platforms, so have an option to disable it
|
||||
AC_ARG_WITH([cimg], AS_HELP_STRING([--without-cimg], [build without CImg (default: with-cimg)]))
|
||||
|
||||
if test x"$with_cimg" != "xno"; then
|
||||
AM_CONDITIONAL(WITH_CIMG, true)
|
||||
AC_DEFINE(WITH_CIMG,1,[include cimg package])
|
||||
CIMG_LIBS=-lstdc++
|
||||
else
|
||||
AM_CONDITIONAL(WITH_CIMG, false)
|
||||
AC_MSG_WARN([disabling CImg binding])
|
||||
fi
|
||||
|
||||
# Gather all up for VIPS_CFLAGS, VIPS_INCLUDES and VIPS_LIBS
|
||||
VIPS_CFLAGS="$VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW3_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $OPENEXR_CFLAGS $LIBOIL_CFLAGS"
|
||||
VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES $FFTW_INCLUDES $LCMS_INCLUDES"
|
||||
VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm -lstdc++"
|
||||
VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm $CIMG_LIBS"
|
||||
|
||||
AC_SUBST(VIPS_CFLAGS)
|
||||
AC_SUBST(VIPS_INCLUDES)
|
||||
|
@ -1,3 +1,13 @@
|
||||
# only build in the cimg dir if it's enabled
|
||||
if WITH_CIMG
|
||||
C_COMPILE_DIR = cimg
|
||||
C_DIST_DIR =
|
||||
C_LIB = cimg/libcimg.la
|
||||
else
|
||||
C_COMPILE_DIR =
|
||||
C_DIST_DIR = cimg
|
||||
C_LIB =
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
acquire \
|
||||
@ -6,7 +16,7 @@ SUBDIRS = \
|
||||
colour \
|
||||
conversion \
|
||||
convolution \
|
||||
cimg \
|
||||
$(C_COMPILE_DIR) \
|
||||
freq_filt \
|
||||
histograms_lut \
|
||||
inplace \
|
||||
@ -31,7 +41,7 @@ libvips_la_LIBADD = \
|
||||
colour/libcolour.la \
|
||||
conversion/libconversion.la \
|
||||
convolution/libconvolution.la \
|
||||
cimg/libcimg.la \
|
||||
$(C_LIB) \
|
||||
freq_filt/libfreq_filt.la \
|
||||
histograms_lut/libhistograms_lut.la \
|
||||
inplace/libinplace.la \
|
||||
@ -57,4 +67,7 @@ libvips_la_LDFLAGS = \
|
||||
vips.def:
|
||||
./makedef.pl $(prefix) > vips.def
|
||||
|
||||
EXTRA_DIST = vips.def makedef.pl
|
||||
EXTRA_DIST = \
|
||||
vips.def \
|
||||
makedef.pl \
|
||||
$(C_DIST_DIR)
|
||||
|
@ -397,7 +397,9 @@ static im_package im__iofuncs = {
|
||||
static im_package *built_in[] = {
|
||||
&im__arithmetic,
|
||||
&im__boolean,
|
||||
#ifdef WITH_CIMG
|
||||
&im__cimg,
|
||||
#endif /*WITH_CIMG*/
|
||||
&im__colour,
|
||||
&im__conversion,
|
||||
&im__convolution,
|
||||
|
Loading…
x
Reference in New Issue
Block a user