From 2d215b44e5278bfad5455dd117af2bfdb1b2cb76 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 22 May 2010 12:13:19 +0000
Subject: [PATCH] fixes to --disable-cxx mode

---
 ChangeLog                   | 2 ++
 configure.in                | 6 ++++--
 libvips/Makefile.am         | 9 ++++++++-
 tools/iofuncs/Makefile.am   | 3 +++
 tools/mosaicing/Makefile.am | 3 +++
 tools/other/Makefile.am     | 4 ++++
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca89f2dc..9658f7d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 12/5/10 started 7.22.0
 - bump and rename
 - vipsthumbnail has a manualpage and sharpens correctly
+- more interpolator work
+- fixes to --disable-cxx mode (thanks Mike)
 
 21/3/10 started 7.21.3
 - added progress feedback to threadpool
diff --git a/configure.in b/configure.in
index cc7d469b..90cbac8d 100644
--- a/configure.in
+++ b/configure.in
@@ -561,7 +561,7 @@ else
   AM_CONDITIONAL(HAVE_PYTHON, false)
 fi
 
-# Gather all up for VIPS_CFLAGS, VIPS_INCLUDES and VIPS_LIBS
+# Gather all up for VIPS_CFLAGS, VIPS_INCLUDES, VIPS_LIBS and VIPS_CXX_LIBS
 # sort includes to get longer, more specific dirs first
 # helps, for example, selecting graphicsmagick over imagemagick
 VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW3_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $MATIO_CFLAGS $OPENEXR_CFLAGS $LIBOIL_CFLAGS 
@@ -571,8 +571,9 @@ done | sort -ru`
 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 $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $MATIO_LIBS $EXIF_LIBS -lm"
 # need -lstdc++ for (eg.) the C++ format loaders
-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 $MATIO_LIBS $EXIF_LIBS -lstdc++ -lm"
+VIPS_CXX_LIBS="-lstdc++"
 
 # we need this to generate paths in swig/python/setup.py.in
 AC_SUBST(top_srcdir)
@@ -581,6 +582,7 @@ AC_SUBST(IM_LIBDIR)
 AC_SUBST(VIPS_CFLAGS)
 AC_SUBST(VIPS_INCLUDES)
 AC_SUBST(VIPS_LIBS)
+AC_SUBST(VIPS_CXX_LIBS)
 AC_SUBST(PACKAGES_USED)
 
 # you'd think we could have 
diff --git a/libvips/Makefile.am b/libvips/Makefile.am
index f611d2be..16c2caee 100644
--- a/libvips/Makefile.am
+++ b/libvips/Makefile.am
@@ -35,7 +35,10 @@ SUBDIRS = \
 
 lib_LTLIBRARIES = libvips.la
 
-libvips_la_SOURCES = dummy.c dummy2.cc
+libvips_la_SOURCES = dummy.c 
+if ENABLE_CXX
+libvips_la_SOURCES += dummy2.cc
+endif
 
 # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
 libvips_la_LIBADD = \
@@ -61,6 +64,10 @@ libvips_la_LIBADD = \
 	video/libvideo.la \
 	@VIPS_LIBS@
 
+if ENABLE_CXX
+libvips_la_LIBADD += @VIPS_CXX_LIBS@
+endif
+
 libvips_la_LDFLAGS = \
 	-no-undefined \
 	-version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ 
diff --git a/tools/iofuncs/Makefile.am b/tools/iofuncs/Makefile.am
index 802f4377..bcc019a0 100644
--- a/tools/iofuncs/Makefile.am
+++ b/tools/iofuncs/Makefile.am
@@ -12,6 +12,9 @@ vipsthumbnail_SOURCES = vipsthumbnail.c
 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
 AM_LDFLAGS = @LDFLAGS@ 
 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@
+if ENABLE_CXX
+LDADD += @VIPS_CXX_LIBS@
+endif
 
 if ENABLE_LINKS
 install-exec-hook:
diff --git a/tools/mosaicing/Makefile.am b/tools/mosaicing/Makefile.am
index e6592c3b..f350f3a1 100644
--- a/tools/mosaicing/Makefile.am
+++ b/tools/mosaicing/Makefile.am
@@ -9,4 +9,7 @@ mergeup_SOURCES =  mergeup.c
 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
 AM_LDFLAGS = @LDFLAGS@ 
 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@
+if ENABLE_CXX
+LDADD += @VIPS_CXX_LIBS@
+endif
 
diff --git a/tools/other/Makefile.am b/tools/other/Makefile.am
index fb1315d0..c1f2f574 100644
--- a/tools/other/Makefile.am
+++ b/tools/other/Makefile.am
@@ -20,4 +20,8 @@ squares_SOURCES = squares.c
 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
 AM_LDFLAGS = @LDFLAGS@ 
 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@
+if ENABLE_CXX
+LDADD += @VIPS_CXX_LIBS@
+endif
+