From 6425cd26605fe6bac173db31273fffe5841e9013 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 13 Dec 2010 17:31:38 +0000
Subject: [PATCH] stuff

---
 ChangeLog       | 3 ++-
 configure.in    | 7 +++++--
 vips-7.25.pc.in | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33bed875..e318ef92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 - faster tiff read for some common cases
 - faster im_tile_cache()
+- add -lstdc++ to vips-7.xx.pc, if we used it
 
 30/11/10 started 7.24.0
 - bump for new stable
diff --git a/configure.in b/configure.in
index bb3f9140..6b984d7f 100644
--- a/configure.in
+++ b/configure.in
@@ -160,9 +160,14 @@ AC_ARG_ENABLE(cxx,
 if test x"$enable_cxx" != "xno"; then
   AC_DEFINE(ENABLE_CXX,1,[build C++ components])
   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
 else
   AM_CONDITIONAL(ENABLE_CXX, false)
+  VIPS_CXX_LIBS=""
   enable_cxx=no
 fi
 
@@ -593,8 +598,6 @@ VIPS_CFLAGS=`echo $VIPS_CFLAGS`
 VIPS_CFLAGS="$VIPS_DEBUG_FLAGS $VIPS_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 $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
 AC_SUBST(top_srcdir)
diff --git a/vips-7.25.pc.in b/vips-7.25.pc.in
index 49fdba0d..864c4ba3 100644
--- a/vips-7.25.pc.in
+++ b/vips-7.25.pc.in
@@ -7,5 +7,5 @@ Name: vips-@IM_MAJOR_VERSION@.@IM_MINOR_VERSION@
 Description: Image processing library
 Version: @VERSION@
 Requires: @PACKAGES_USED@
-Libs: -L${libdir} -lvips @VIPS_LIBS@
+Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@
 Cflags: -I${includedir}