1 diff -u --recursive vips-7.28.9-vanilla/configure.in vips-7.28.9/configure.in
2 --- vips-7.28.9-vanilla/configure.in 2012-07-14 22:35:08.209029299 -0500
3 +++ vips-7.28.9/configure.in 2012-07-14 22:36:25.634927858 -0500
16 -# vips_PROG_CXX_WORKS
17 -# Check whether the C++ compiler works.
18 -AC_DEFUN([vips_PROG_CXX_WORKS],
19 - [AC_REQUIRE([AC_PROG_CXX])dnl
20 - AC_CACHE_CHECK([whether the C++ compiler works],
21 - [vips_cv_prog_cxx_works],
22 - [AC_LANG_PUSH([C++])
23 - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
24 - [vips_cv_prog_cxx_works=yes],
25 - [vips_cv_prog_cxx_works=no])
26 - AC_LANG_POP([C++])])
29 -# option to build without C++
30 -# handy for some embedded applications
31 -# also, including C++ source causes link problems on some
32 -# platforms, so have an option to disable it
34 - AS_HELP_STRING([--enable-cxx], [build C++ components (default: test)]))
36 -if test x"$enable_cxx" != x"no"; then
38 - if test x"$vips_cv_prog_cxx_works" = x"yes"; then
39 - AC_DEFINE(ENABLE_CXX,1,[build C++ components])
40 - AM_CONDITIONAL(ENABLE_CXX, true)
41 - # need -lstdc++ for (eg.) the C++ format loaders
42 - # this gets added to vips-7.xx.pc to help mingw and friends link programs
44 - VIPS_CXX_LIBS="-lstdc++"
49 -if test x"$enable_cxx" != x"yes"; then
50 - AM_CONDITIONAL(ENABLE_CXX, false)
55 # we need a fully expanded version of $libdir
56 # without this we get something like
57 # define VIPS_LIBDIR ${exec_prefix}/lib
60 AC_SUBST(VIPS_INCLUDES)
62 -AC_SUBST(VIPS_CXX_LIBS)
63 AC_SUBST(PACKAGES_USED)
65 # you'd think we could have
67 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4
72 libvips/include/vips/version.h
73 libvips/include/Makefile
74 libvips/include/vips/Makefile
76 libvips/arithmetic/Makefile
77 - libvips/cimg/Makefile
78 libvips/colour/Makefile
79 libvips/conversion/Makefile
80 libvips/convolution/Makefile
82 libvips/other/Makefile
83 libvips/resample/Makefile
84 libvips/video/Makefile
85 - libvipsCC/include/Makefile
86 - libvipsCC/include/vips/Makefile
90 tools/batch_image_convert
95 - swig/vipsCC/Makefile
99 diff -u --recursive vips-7.28.9-vanilla/libvips/Makefile.am vips-7.28.9/libvips/Makefile.am
100 --- vips-7.28.9-vanilla/libvips/Makefile.am 2012-07-14 22:35:08.206029420 -0500
101 +++ vips-7.28.9/libvips/Makefile.am 2012-07-14 22:37:24.446571912 -0500
103 # only build in the cimg dir if C++ is enabled
105 -C_COMPILE_DIR = cimg
107 -C_LIB = cimg/libcimg.la
126 # empty means default to C linking
129 -# if we have C++ components enabled, make sure we link the top-level with c++
131 -# sadly the if/endif isn't enough to stop automake detecting a c++ link even
132 -# when c++ is disabled ... comment out this line if you have linking problems
134 -nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cc
137 # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
138 libvips_la_LIBADD = \
139 resample/libresample.la \
141 conversion/libconversion.la \
142 convolution/libconvolution.la \
143 deprecated/libdeprecated.la \
145 foreign/libforeign.la \
146 freq_filt/libfreq_filt.la \
147 histograms_lut/libhistograms_lut.la \
153 -libvips_la_LIBADD += @VIPS_CXX_LIBS@
156 libvips_la_LDFLAGS = \
158 -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@
165 -include $(INTROSPECTION_MAKEFILE)
166 diff -u --recursive vips-7.28.9-vanilla/libvips/resample/Makefile.am vips-7.28.9/libvips/resample/Makefile.am
167 --- vips-7.28.9-vanilla/libvips/resample/Makefile.am 2012-07-14 22:35:08.191030020 -0500
168 +++ vips-7.28.9/libvips/resample/Makefile.am 2012-07-14 22:37:49.470569578 -0500
170 # you'd think we could just define a couple of variables, but that seems to
171 # confuse libtool and make it link the library with g++
172 # instead, have two completely different paths
175 -libresample_la_SOURCES = \
179 - im_rightshift_size.c \
181 - resample_dispatch.c \
190 libresample_la_SOURCES = \
205 noinst_LTLIBRARIES = libresample.la
207 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
208 diff -u --recursive vips-7.28.9-vanilla/Makefile.am vips-7.28.9/Makefile.am
209 --- vips-7.28.9-vanilla/Makefile.am 2012-07-14 22:35:08.220028859 -0500
210 +++ vips-7.28.9/Makefile.am 2012-07-14 22:38:43.217417048 -0500
213 -# turn off libvipsCC if C++ is disabled
215 -C_COMPILE_DIR = libvipsCC
217 -C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc
219 -# turn on Python if we can (requires C++)
221 -P_COMPILE_DIR = swig
227 -C_DIST_DIR = libvipsCC
247 vips-7.${VIPS_MINOR_VERSION}.pc.in \
248 - vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \
255 pkgconfigdir = $(libdir)/pkgconfig
256 pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG)
257 diff -u --recursive vips-7.28.9-vanilla/tools/Makefile.am vips-7.28.9/tools/Makefile.am
258 --- vips-7.28.9-vanilla/tools/Makefile.am 2012-07-14 22:35:08.221028819 -0500
259 +++ vips-7.28.9/tools/Makefile.am 2012-07-14 22:40:51.397283833 -0500
261 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
262 AM_LDFLAGS = @LDFLAGS@
263 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@
265 -LDADD += @VIPS_CXX_LIBS@
270 diff -u --recursive vips-7.28.9-vanilla/vips-7.28.pc.in vips-7.28.9/vips-7.28.pc.in
271 --- vips-7.28.9-vanilla/vips-7.28.pc.in 2012-07-14 22:35:08.208029340 -0500
272 +++ vips-7.28.9/vips-7.28.pc.in 2012-07-14 22:41:03.591795535 -0500
274 Description: Image processing library
276 Requires: @PACKAGES_USED@
277 -Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@
278 +Libs: -L${libdir} -lvips @VIPS_LIBS@
279 Cflags: -I${includedir}