sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
John Cupitt 2010-12-13 17:31:38 +00:00
parent ac69b83c7b
commit 6425cd2660
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
6/12/10 started 7.24.0 6/12/10 started 7.25.0
- attach the jpeg thumbnail and multiscan fields (thanks Mike) - attach the jpeg thumbnail and multiscan fields (thanks Mike)
- faster tiff read for some common cases - faster tiff read for some common cases
- faster im_tile_cache() - faster im_tile_cache()
- add -lstdc++ to vips-7.xx.pc, if we used it
30/11/10 started 7.24.0 30/11/10 started 7.24.0
- bump for new stable - bump for new stable

7
configure.in
View File

@ -160,9 +160,14 @@ AC_ARG_ENABLE(cxx,
if test x"$enable_cxx" != "xno"; then if test x"$enable_cxx" != "xno"; then
AC_DEFINE(ENABLE_CXX,1,[build C++ components]) AC_DEFINE(ENABLE_CXX,1,[build C++ components])
AM_CONDITIONAL(ENABLE_CXX, true) AM_CONDITIONAL(ENABLE_CXX, true)
# need -lstdc++ for (eg.) the C++ format loaders
# this gets added to vips-7.xx.pc to help mingw and friends link programs
# using libvips
VIPS_CXX_LIBS="-lstdc++"
enable_cxx=yes enable_cxx=yes
else else
AM_CONDITIONAL(ENABLE_CXX, false) AM_CONDITIONAL(ENABLE_CXX, false)
VIPS_CXX_LIBS=""
enable_cxx=no enable_cxx=no
fi fi
@ -593,8 +598,6 @@ VIPS_CFLAGS=`echo $VIPS_CFLAGS`
VIPS_CFLAGS="$VIPS_DEBUG_FLAGS $VIPS_CFLAGS" VIPS_CFLAGS="$VIPS_DEBUG_FLAGS $VIPS_CFLAGS"
VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES $FFTW_INCLUDES $LCMS_INCLUDES" 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 $ORC_LIBS $LCMS_LIBS $OPENEXR_LIBS $CFITSIO_LIBS $MATIO_LIBS $EXIF_LIBS -lm" VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $ORC_LIBS $LCMS_LIBS $OPENEXR_LIBS $CFITSIO_LIBS $MATIO_LIBS $EXIF_LIBS -lm"
# need -lstdc++ for (eg.) the C++ format loaders
VIPS_CXX_LIBS="-lstdc++"
# we need this to generate paths in swig/python/setup.py.in # we need this to generate paths in swig/python/setup.py.in
AC_SUBST(top_srcdir) AC_SUBST(top_srcdir)

2
vips-7.25.pc.in
View File

@ -7,5 +7,5 @@ Name: vips-@IM_MAJOR_VERSION@.@IM_MINOR_VERSION@
Description: Image processing library Description: Image processing library
Version: @VERSION@ Version: @VERSION@
Requires: @PACKAGES_USED@ Requires: @PACKAGES_USED@
Libs: -L${libdir} -lvips @VIPS_LIBS@ Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}